Move to kernel style SPDX license identifiers

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

diff --git a/tests/lib/test_simple_sink.c b/tests/lib/test_simple_sink.c
index 13519ddd8eaab3184a8f4a138b357e7baa77ad94..952b6bf52a1d0300b09583fb8b78e7c4bddc269c 100644 (file)
--- a/tests/lib/test_simple_sink.c
+++ b/tests/lib/test_simple_sink.c
@@ -1,18 +1,7 @@
 /*
- * Copyright (c) 2019 Philippe Proulx <pproulx@efficios.com>
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * 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) 2019 Philippe Proulx <pproulx@efficios.com>
  */
 
 #include <babeltrace2/babeltrace.h>
@@ -20,7 +9,7 @@
 #include <string.h>
 #include "tap/tap.h"
 
-#define NR_TESTS 60
+#define NR_TESTS 68
 
 struct test_data {
        bt_graph_simple_sink_component_initialize_func_status init_status;
@@ -29,7 +18,7 @@ struct test_data {
 
 static
 bt_graph_simple_sink_component_initialize_func_status simple_INITIALIZE_func(
-               bt_self_component_port_input_message_iterator *iterator,
+               bt_message_iterator *iterator,
                void *data)
 {
        struct test_data *test_data = data;
@@ -41,7 +30,7 @@ bt_graph_simple_sink_component_initialize_func_status simple_INITIALIZE_func(
 
 static
 bt_graph_simple_sink_component_consume_func_status simple_consume_func(
-               bt_self_component_port_input_message_iterator *iterator,
+               bt_message_iterator *iterator,
                void *data)
 {
        struct test_data *test_data = data;
@@ -72,17 +61,18 @@ bt_component_class_initialize_method_status src_init(
 }
 
 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 *message_iterator,
                bt_message_array_const msgs, uint64_t capacity,
                uint64_t *count)
 {
-       return BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_END;
+       return BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_END;
 }
 
 static
 bt_graph *create_graph_with_source(const bt_port_output **out_port)
 {
+       bt_message_iterator_class *msg_iter_cls;
        bt_component_class_source *src_comp_cls;
        bt_graph *graph;
        const bt_component_source *src_comp = NULL;
@@ -90,7 +80,11 @@ bt_graph *create_graph_with_source(const bt_port_output **out_port)
        bt_component_class_set_method_status set_method_status;
 
        BT_ASSERT(out_port);
-       src_comp_cls = bt_component_class_source_create("src", src_iter_next);
+
+       msg_iter_cls = bt_message_iterator_class_create(src_iter_next);
+       BT_ASSERT(msg_iter_cls);
+
+       src_comp_cls = bt_component_class_source_create("src", msg_iter_cls);
        BT_ASSERT(src_comp_cls);
        set_method_status = bt_component_class_source_set_initialize_method(
                src_comp_cls, src_init);
@@ -104,8 +98,8 @@ bt_graph *create_graph_with_source(const bt_port_output **out_port)
        *out_port = bt_component_source_borrow_output_port_by_index_const(
                src_comp, 0);
        BT_ASSERT(*out_port);
-       bt_component_source_put_ref(src_comp);
        bt_component_class_source_put_ref(src_comp_cls);
+       bt_message_iterator_class_put_ref(msg_iter_cls);
        return graph;
 }
 
@@ -126,29 +120,41 @@ void test_simple_expect_run_once_status(
                .init_status = init_status,
                .consume_status = consume_status,
        };
+       const struct bt_error *err;
 
        graph = create_graph_with_source(&src_out_port);
        BT_ASSERT(graph);
        BT_ASSERT(src_out_port);
+
        add_comp_status = bt_graph_add_simple_sink_component(graph, "sink",
                simple_INITIALIZE_func, simple_consume_func, simple_fini_func,
                &test_data, &sink_comp);
        BT_ASSERT(add_comp_status == BT_GRAPH_ADD_COMPONENT_STATUS_OK);
        BT_ASSERT(sink_comp);
+
        sink_in_port = bt_component_sink_borrow_input_port_by_name_const(
                sink_comp, "in");
        ok(sink_in_port,
                "Simple sink component has an input port named \"in\"");
+
        connect_status = bt_graph_connect_ports(graph, src_out_port,
                sink_in_port, NULL);
        ok(connect_status == BT_GRAPH_CONNECT_PORTS_STATUS_OK,
                "Simple sink component's \"in\" port is connectable");
+
        run_once_status = bt_graph_run_once(graph);
        ok(run_once_status == exp_run_once_status,
                "Graph \"run once\" status is the expected one (status code: %d)",
                run_once_status);
-       bt_component_sink_put_ref(sink_comp);
+
+       err = bt_current_thread_take_error();
+       ok((run_once_status < 0) == (err != NULL),
+               "Current thread error is set if bt_graph_run_once returned an error");
+
        bt_graph_put_ref(graph);
+       if (err) {
+               bt_error_release(err);
+       }
 }
 
 int main(void)