tests: fix shellcheck warnings in plugins/sink.ctf.fs/succeed/test_succeed

[babeltrace.git] / tests / lib / test_graph_topo.c

diff --git a/tests/lib/test_graph_topo.c b/tests/lib/test_graph_topo.c
index 184528d1a1a7b6b8fa09a7ead957e1258ebf6069..d6c4c07411c2f439572cea0319fc56ac0b13a6fa 100644 (file)
--- a/tests/lib/test_graph_topo.c
+++ b/tests/lib/test_graph_topo.c
@@ -72,6 +72,7 @@ struct event {
 };
 
 static GArray *events;
+static bt_message_iterator_class *msg_iter_class;
 static bt_component_class_source *src_comp_class;
 static bt_component_class_sink *sink_comp_class;
 static enum test current_test;
@@ -190,12 +191,12 @@ size_t event_pos(struct event *event)
 }
 
 static
-bt_component_class_message_iterator_next_method_status src_iter_next(
+bt_message_iterator_class_next_method_status src_iter_next(
                bt_self_message_iterator *self_iterator,
                bt_message_array_const msgs, uint64_t capacity,
                uint64_t *count)
 {
-       return BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR;
+       return BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_ERROR;
 }
 
 static
@@ -339,8 +340,11 @@ void init_test(void)
 {
        int ret;
 
+       msg_iter_class = bt_message_iterator_class_create(src_iter_next);
+       BT_ASSERT(msg_iter_class);
+
        src_comp_class = bt_component_class_source_create(
-               "src", src_iter_next);
+               "src", msg_iter_class);
        BT_ASSERT(src_comp_class);
        ret = bt_component_class_source_set_initialize_method(
                src_comp_class, src_init);
@@ -401,10 +405,10 @@ bt_graph *create_graph(void)
 
        BT_ASSERT(graph);
        ret = bt_graph_add_source_component_output_port_added_listener(
-               graph, graph_src_output_port_added, NULL, NULL, NULL);
+               graph, graph_src_output_port_added, NULL, NULL);
        BT_ASSERT(ret >= 0);
        ret = bt_graph_add_sink_component_input_port_added_listener(
-               graph, graph_sink_input_port_added, NULL, NULL, NULL);
+               graph, graph_sink_input_port_added, NULL, NULL);
        BT_ASSERT(ret >= 0);
        return graph;
 }
@@ -501,8 +505,6 @@ void test_src_adds_port_in_port_connected(void)
        ok(src_port_connected_pos < graph_port_added_src_pos,
                "event order is good");
 
-       bt_component_source_put_ref(src);
-       bt_component_sink_put_ref(sink);
        bt_graph_put_ref(graph);
 }
 
@@ -569,9 +571,7 @@ void test_simple(void)
        event.data.sink_comp_input_port_connected.other_port = gsrc_def_port;
        ok(has_event(&event), "got the expected sink's port connected event");
 
-       bt_component_sink_put_ref(sink);
        bt_graph_put_ref(graph);
-       bt_component_source_put_ref(src);
 }
 
 static
@@ -635,9 +635,6 @@ void test_src_port_connected_error(void)
        ok(has_event(&event), "got the expected source's port connected event");
 
        bt_graph_put_ref(graph);
-       bt_component_sink_put_ref(sink);
-       bt_component_source_put_ref(src);
-       bt_connection_put_ref(conn);
 }
 
 static
@@ -707,10 +704,7 @@ void test_sink_port_connected_error(void)
        event.data.sink_comp_input_port_connected.other_port = gsrc_def_port;
        ok(has_event(&event), "got the expected sink's port connected event");
 
-       bt_connection_put_ref(conn);
        bt_graph_put_ref(graph);
-       bt_component_sink_put_ref(sink);
-       bt_component_source_put_ref(src);
 }
 
 static