Add bt_graph_add_component(), make bt_component_create() internal

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

diff --git a/tests/lib/test_bt_notification_iterator.c b/tests/lib/test_bt_notification_iterator.c
index 656d84ac7d965ef234f9974354b9a4f44b3e5ca0..d6ca1973d58c4960539f3068a6f3d5fc891dd9d2 100644 (file)
--- a/tests/lib/test_bt_notification_iterator.c
+++ b/tests/lib/test_bt_notification_iterator.c
@@ -38,6 +38,7 @@
 #include <babeltrace/graph/component-sink.h>
 #include <babeltrace/graph/component-source.h>
 #include <babeltrace/graph/component.h>
+#include <babeltrace/graph/connection.h>
 #include <babeltrace/graph/graph.h>
 #include <babeltrace/graph/notification-event.h>
 #include <babeltrace/graph/notification-inactivity.h>
@@ -409,9 +410,6 @@ void init_static_data(void)
        assert(empty_struct_ft);
        trace = bt_ctf_trace_create();
        assert(trace);
-       ret = bt_ctf_trace_set_native_byte_order(trace,
-               BT_CTF_BYTE_ORDER_LITTLE_ENDIAN);
-       assert(ret == 0);
        ret = bt_ctf_trace_set_packet_header_type(trace, empty_struct_ft);
        assert(ret == 0);
        src_empty_cc_prio_map = bt_clock_class_priority_map_create();
@@ -548,7 +546,7 @@ enum bt_notification_iterator_status src_iter_init(
                user_data->seq = seq_multiple_auto_packet_end_stream_end_from_end;
                break;
        default:
-               assert(false);
+               abort();
        }
 
        return BT_NOTIFICATION_ITERATOR_STATUS_OK;
@@ -662,7 +660,7 @@ struct bt_notification_iterator_next_return src_iter_next_seq(
                event_packet = src_stream2_packet2;
                break;
        default:
-               assert(false);
+               abort();
        }
 
        if (event_packet) {
@@ -703,12 +701,11 @@ enum bt_component_status src_init(
                struct bt_private_component *private_component,
                struct bt_value *params, void *init_method_data)
 {
-       void *priv_port;
+       int ret;
 
-       priv_port = bt_private_component_source_add_output_private_port(
-               private_component, "out", NULL);
-       assert(priv_port);
-       bt_put(priv_port);
+       ret = bt_private_component_source_add_output_private_port(
+               private_component, "out", NULL, NULL);
+       assert(ret == 0);
        return BT_COMPONENT_STATUS_OK;
 }
 
@@ -745,7 +742,7 @@ enum bt_component_status sink_consume(
                BT_PUT(user_data->notif_iter);
                goto end;
        case BT_NOTIFICATION_ITERATOR_STATUS_AGAIN:
-               assert(false);
+               abort();
        default:
                break;
        }
@@ -828,13 +825,13 @@ void sink_port_connected(struct bt_private_component *private_component,
                bt_private_port_get_private_connection(self_private_port);
        struct sink_user_data *user_data = bt_private_component_get_user_data(
                private_component);
+       enum bt_connection_status conn_status;
 
        assert(user_data);
        assert(priv_conn);
-       user_data->notif_iter =
-               bt_private_connection_create_notification_iterator(priv_conn,
-                       NULL);
-       assert(user_data->notif_iter);
+       conn_status = bt_private_connection_create_notification_iterator(
+               priv_conn, NULL, &user_data->notif_iter);
+       assert(conn_status == 0);
        bt_put(priv_conn);
 }
 
@@ -845,16 +842,14 @@ enum bt_component_status sink_init(
 {
        struct sink_user_data *user_data = g_new0(struct sink_user_data, 1);
        int ret;
-       void *priv_port;
 
        assert(user_data);
        ret = bt_private_component_set_user_data(private_component,
                user_data);
        assert(ret == 0);
-       priv_port = bt_private_component_sink_add_input_private_port(
-               private_component, "in", NULL);
-       assert(priv_port);
-       bt_put(priv_port);
+       ret = bt_private_component_sink_add_input_private_port(
+               private_component, "in", NULL, NULL);
+       assert(ret == 0);
        return BT_COMPONENT_STATUS_OK;
 }
 
@@ -871,7 +866,7 @@ void sink_finalize(struct bt_private_component *private_component)
 }
 
 static
-void create_source_sink(struct bt_component **source,
+void create_source_sink(struct bt_graph *graph, struct bt_component **source,
                struct bt_component **sink)
 {
        struct bt_component_class *src_comp_class;
@@ -892,8 +887,9 @@ void create_source_sink(struct bt_component **source,
        ret = bt_component_class_source_set_notification_iterator_finalize_method(
                src_comp_class, src_iter_finalize);
        assert(ret == 0);
-       *source = bt_component_create(src_comp_class, "source", NULL);
-       assert(*source);
+       ret = bt_graph_add_component(graph, src_comp_class, "source", NULL,
+               source);
+       assert(ret == 0);
 
        /* Create sink component */
        sink_comp_class = bt_component_class_sink_create("sink", sink_consume);
@@ -905,7 +901,9 @@ void create_source_sink(struct bt_component **source,
        ret = bt_component_class_set_port_connected_method(sink_comp_class,
                sink_port_connected);
        assert(ret == 0);
-       *sink = bt_component_create(sink_comp_class, "sink", NULL);
+       ret = bt_graph_add_component(graph, sink_comp_class, "sink", NULL,
+               sink);
+       assert(ret == 0);
 
        bt_put(src_comp_class);
        bt_put(sink_comp_class);
@@ -920,24 +918,22 @@ void do_std_test(enum test test, const char *name,
        struct bt_port *upstream_port;
        struct bt_port *downstream_port;
        struct bt_graph *graph;
-       void *conn;
        enum bt_graph_status graph_status = BT_GRAPH_STATUS_OK;
 
        clear_test_events();
        current_test = test;
        diag("test: %s", name);
-       create_source_sink(&src_comp, &sink_comp);
        graph = bt_graph_create();
        assert(graph);
+       create_source_sink(graph, &src_comp, &sink_comp);
 
        /* Connect source to sink */
        upstream_port = bt_component_source_get_output_port_by_name(src_comp, "out");
        assert(upstream_port);
        downstream_port = bt_component_sink_get_input_port_by_name(sink_comp, "in");
        assert(downstream_port);
-       conn = bt_graph_connect_ports(graph, upstream_port, downstream_port);
-       assert(conn);
-       bt_put(conn);
+       graph_status = bt_graph_connect_ports(graph, upstream_port,
+               downstream_port, NULL);
        bt_put(upstream_port);
        bt_put(downstream_port);