Reduce the number of Makefiles in 'doc/'

[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 d3d45818d224531517935b4318aa328549c6e9da..0a0f2bc43451f455df794f251c6656bf2a32937a 100644 (file)
--- a/tests/lib/test_graph_topo.c
+++ b/tests/lib/test_graph_topo.c
@@ -1,20 +1,7 @@
 /*
- * test_graph_topo.c
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * Copyright 2017 - Philippe Proulx <pproulx@efficios.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; under version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ * Copyright (C) 2017 Philippe Proulx <pproulx@efficios.com>
  */
 
 #include <babeltrace2/babeltrace.h>
@@ -164,7 +151,7 @@ bool has_event(struct event *event)
        size_t i;
 
        for (i = 0; i < events->len; i++) {
-               struct event *ev = &g_array_index(events, struct event, i);
+               struct event *ev = &bt_g_array_index(events, struct event, i);
 
                if (compare_events(event, ev)) {
                        return true;
@@ -180,7 +167,7 @@ size_t event_pos(struct event *event)
        size_t i;
 
        for (i = 0; i < events->len; i++) {
-               struct event *ev = &g_array_index(events, struct event, i);
+               struct event *ev = &bt_g_array_index(events, struct event, i);
 
                if (compare_events(event, ev)) {
                        return i;
@@ -371,6 +358,7 @@ void fini_test(void)
        bt_component_class_source_put_ref(src_comp_class);
        bt_component_class_sink_put_ref(sink_comp_class);
        g_array_free(events, TRUE);
+       BT_MESSAGE_ITERATOR_CLASS_PUT_REF_AND_RESET(msg_iter_class);
 }
 
 static
@@ -505,8 +493,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);
 }
 
@@ -573,9 +559,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
@@ -639,9 +623,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
@@ -711,10 +692,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