X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Ftest_graph_topo.c;h=d3d45818d224531517935b4318aa328549c6e9da;hb=a3f0c7db90f4cfc81090a83a7442b7bc624d5789;hp=b0409d49ce297986fc2ed96ba616bccd0201c05d;hpb=3fadfbc0c91f82c46bd36e6e0657ea93570c9db1;p=babeltrace.git diff --git a/tests/lib/test_graph_topo.c b/tests/lib/test_graph_topo.c index b0409d49..d3d45818 100644 --- a/tests/lib/test_graph_topo.c +++ b/tests/lib/test_graph_topo.c @@ -18,7 +18,7 @@ */ #include -#include +#include "common/assert.h" #include #include #include @@ -26,16 +26,13 @@ #include "tap/tap.h" -#define NR_TESTS 48 +#define NR_TESTS 26 enum event_type { - SRC_COMP_ACCEPT_OUTPUT_PORT_CONNECTION, - SINK_COMP_ACCEPT_INPUT_PORT_CONNECTION, SRC_COMP_OUTPUT_PORT_CONNECTED, SINK_COMP_INPUT_PORT_CONNECTED, GRAPH_SRC_OUTPUT_PORT_ADDED, GRAPH_SINK_INPUT_PORT_ADDED, - GRAPH_SRC_SINK_PORTS_CONNECTED, }; enum test { @@ -50,18 +47,6 @@ struct event { enum event_type type; union { - struct { - const bt_component *comp; - const bt_port *self_port; - const bt_port *other_port; - } src_comp_accept_output_port_connection; - - struct { - const bt_component *comp; - const bt_port *self_port; - const bt_port *other_port; - } sink_comp_accept_input_port_connection; - struct { const bt_component *comp; const bt_port *self_port; @@ -83,17 +68,11 @@ struct event { const bt_component *comp; const bt_port *port; } graph_sink_input_port_added; - - struct { - const bt_component *upstream_comp; - const bt_component *downstream_comp; - const bt_port *upstream_port; - const bt_port *downstream_port; - } graph_src_sink_ports_connected; } data; }; 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; @@ -118,38 +97,6 @@ bool compare_events(struct event *ev_a, struct event *ev_b) } switch (ev_a->type) { - case SRC_COMP_ACCEPT_OUTPUT_PORT_CONNECTION: - if (ev_a->data.src_comp_accept_output_port_connection.comp != - ev_b->data.src_comp_accept_output_port_connection.comp) { - return false; - } - - if (ev_a->data.src_comp_accept_output_port_connection.self_port != - ev_b->data.src_comp_accept_output_port_connection.self_port) { - return false; - } - - if (ev_a->data.src_comp_accept_output_port_connection.other_port != - ev_b->data.src_comp_accept_output_port_connection.other_port) { - return false; - } - break; - case SINK_COMP_ACCEPT_INPUT_PORT_CONNECTION: - if (ev_a->data.sink_comp_accept_input_port_connection.comp != - ev_b->data.sink_comp_accept_input_port_connection.comp) { - return false; - } - - if (ev_a->data.sink_comp_accept_input_port_connection.self_port != - ev_b->data.sink_comp_accept_input_port_connection.self_port) { - return false; - } - - if (ev_a->data.sink_comp_accept_input_port_connection.other_port != - ev_b->data.sink_comp_accept_input_port_connection.other_port) { - return false; - } - break; case SRC_COMP_OUTPUT_PORT_CONNECTED: if (ev_a->data.src_comp_output_port_connected.comp != ev_b->data.src_comp_output_port_connected.comp) { @@ -204,27 +151,6 @@ bool compare_events(struct event *ev_a, struct event *ev_b) return false; } break; - case GRAPH_SRC_SINK_PORTS_CONNECTED: - if (ev_a->data.graph_src_sink_ports_connected.upstream_comp != - ev_b->data.graph_src_sink_ports_connected.upstream_comp) { - return false; - } - - if (ev_a->data.graph_src_sink_ports_connected.downstream_comp != - ev_b->data.graph_src_sink_ports_connected.downstream_comp) { - return false; - } - - if (ev_a->data.graph_src_sink_ports_connected.upstream_port != - ev_b->data.graph_src_sink_ports_connected.upstream_port) { - return false; - } - - if (ev_a->data.graph_src_sink_ports_connected.downstream_port != - ev_b->data.graph_src_sink_ports_connected.downstream_port) { - return false; - } - break; default: abort(); } @@ -265,62 +191,16 @@ size_t event_pos(struct event *event) } static -bt_self_message_iterator_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_SELF_MESSAGE_ITERATOR_STATUS_ERROR; -} - -static -bt_self_component_status src_accept_output_port_connection( - bt_self_component_source *self_comp, - bt_self_component_port_output *self_comp_port, - const bt_port_input *other_port) -{ - struct event event = { - .type = SRC_COMP_ACCEPT_OUTPUT_PORT_CONNECTION, - .data.src_comp_accept_output_port_connection = { - .comp = bt_self_component_as_component( - bt_self_component_source_as_self_component( - self_comp)), - .self_port = bt_self_component_port_as_port( - bt_self_component_port_output_as_self_component_port( - self_comp_port)), - .other_port = bt_port_input_as_port_const(other_port), - }, - }; - - append_event(&event); - return BT_SELF_COMPONENT_STATUS_OK; -} - -static -bt_self_component_status sink_accept_input_port_connection( - bt_self_component_sink *self_comp, - bt_self_component_port_input *self_comp_port, - const bt_port_output *other_port) -{ - struct event event = { - .type = SINK_COMP_ACCEPT_INPUT_PORT_CONNECTION, - .data.sink_comp_accept_input_port_connection = { - .comp = bt_self_component_as_component( - bt_self_component_sink_as_self_component( - self_comp)), - .self_port = bt_self_component_port_as_port( - bt_self_component_port_input_as_self_component_port( - self_comp_port)), - .other_port = bt_port_output_as_port_const(other_port), - }, - }; - - append_event(&event); - return BT_SELF_COMPONENT_STATUS_OK; + return BT_MESSAGE_ITERATOR_CLASS_NEXT_METHOD_STATUS_ERROR; } static -bt_self_component_status src_output_port_connected( +bt_component_class_port_connected_method_status src_output_port_connected( bt_self_component_source *self_comp, bt_self_component_port_output *self_comp_port, const bt_port_input *other_port) @@ -348,16 +228,16 @@ bt_self_component_status src_output_port_connected( BT_ASSERT(ret == 0); break; case TEST_SRC_PORT_CONNECTED_ERROR: - return BT_SELF_COMPONENT_STATUS_ERROR; + return BT_COMPONENT_CLASS_PORT_CONNECTED_METHOD_STATUS_ERROR; default: break; } - return BT_SELF_COMPONENT_STATUS_OK; + return BT_COMPONENT_CLASS_PORT_CONNECTED_METHOD_STATUS_OK; } static -bt_self_component_status sink_input_port_connected( +bt_component_class_port_connected_method_status sink_input_port_connected( bt_self_component_sink *self_comp, bt_self_component_port_input *self_comp_port, const bt_port_output *other_port) @@ -378,15 +258,16 @@ bt_self_component_status sink_input_port_connected( append_event(&event); if (current_test == TEST_SINK_PORT_CONNECTED_ERROR) { - return BT_SELF_COMPONENT_STATUS_ERROR; + return BT_COMPONENT_CLASS_PORT_CONNECTED_METHOD_STATUS_ERROR; } else { - return BT_SELF_COMPONENT_STATUS_OK; + return BT_COMPONENT_CLASS_PORT_CONNECTED_METHOD_STATUS_OK; } } static -bt_self_component_status src_init( +bt_component_class_initialize_method_status src_init( bt_self_component_source *self_comp, + bt_self_component_source_configuration *config, const bt_value *params, void *init_method_data) { int ret; @@ -394,12 +275,13 @@ bt_self_component_status src_init( ret = bt_self_component_source_add_output_port( self_comp, "out", NULL, NULL); BT_ASSERT(ret == 0); - return BT_SELF_COMPONENT_STATUS_OK; + return BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK; } static -bt_self_component_status sink_init( +bt_component_class_initialize_method_status sink_init( bt_self_component_sink *self_comp, + bt_self_component_sink_configuration *config, const bt_value *params, void *init_method_data) { int ret; @@ -407,18 +289,18 @@ bt_self_component_status sink_init( ret = bt_self_component_sink_add_input_port(self_comp, "in", NULL, NULL); BT_ASSERT(ret == 0); - return BT_SELF_COMPONENT_STATUS_OK; + return BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK; } static -bt_self_component_status sink_consume( +bt_component_class_sink_consume_method_status sink_consume( bt_self_component_sink *self_comp) { - return BT_SELF_COMPONENT_STATUS_OK; + return BT_COMPONENT_CLASS_SINK_CONSUME_METHOD_STATUS_OK; } static -bt_graph_listener_status graph_src_output_port_added( +bt_graph_listener_func_status graph_src_output_port_added( const bt_component_source *comp, const bt_port_output *port, void *data) { @@ -432,11 +314,11 @@ bt_graph_listener_status graph_src_output_port_added( append_event(&event); - return BT_GRAPH_LISTENER_STATUS_OK; + return BT_GRAPH_LISTENER_FUNC_STATUS_OK; } static -bt_graph_listener_status graph_sink_input_port_added( +bt_graph_listener_func_status graph_sink_input_port_added( const bt_component_sink *comp, const bt_port_input *port, void *data) { @@ -450,33 +332,7 @@ bt_graph_listener_status graph_sink_input_port_added( append_event(&event); - return BT_GRAPH_LISTENER_STATUS_OK; -} - -static -bt_graph_listener_status graph_src_sink_ports_connected( - const bt_component_source *upstream_comp, - const bt_component_sink *downstream_comp, - const bt_port_output *upstream_port, - const bt_port_input *downstream_port, void *data) -{ - struct event event = { - .type = GRAPH_SRC_SINK_PORTS_CONNECTED, - .data.graph_src_sink_ports_connected = { - .upstream_comp = - bt_component_source_as_component_const(upstream_comp), - .downstream_comp = - bt_component_sink_as_component_const(downstream_comp), - .upstream_port = - bt_port_output_as_port_const(upstream_port), - .downstream_port = - bt_port_input_as_port_const(downstream_port), - }, - }; - - append_event(&event); - - return BT_GRAPH_LISTENER_STATUS_OK; + return BT_GRAPH_LISTENER_FUNC_STATUS_OK; } static @@ -484,27 +340,24 @@ 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_init_method( + ret = bt_component_class_source_set_initialize_method( src_comp_class, src_init); BT_ASSERT(ret == 0); - ret = bt_component_class_source_set_accept_output_port_connection_method( - src_comp_class, src_accept_output_port_connection); - BT_ASSERT(ret == 0); ret = bt_component_class_source_set_output_port_connected_method( src_comp_class, src_output_port_connected); BT_ASSERT(ret == 0); sink_comp_class = bt_component_class_sink_create("sink", sink_consume); BT_ASSERT(sink_comp_class); - ret = bt_component_class_sink_set_init_method(sink_comp_class, + ret = bt_component_class_sink_set_initialize_method(sink_comp_class, sink_init); BT_ASSERT(ret == 0); - ret = bt_component_class_sink_set_accept_input_port_connection_method( - sink_comp_class, sink_accept_input_port_connection); - BT_ASSERT(ret == 0); ret = bt_component_class_sink_set_input_port_connected_method( sink_comp_class, sink_input_port_connected); BT_ASSERT(ret == 0); @@ -527,7 +380,7 @@ const bt_component_source *create_src(bt_graph *graph) int ret; ret = bt_graph_add_source_component(graph, src_comp_class, - "src-comp", NULL, &comp); + "src-comp", NULL, BT_LOGGING_LEVEL_NONE, &comp); BT_ASSERT(ret == 0); return comp; } @@ -539,7 +392,7 @@ const bt_component_sink *create_sink(bt_graph *graph) int ret; ret = bt_graph_add_sink_component(graph, sink_comp_class, - "sink-comp", NULL, &comp); + "sink-comp", NULL, BT_LOGGING_LEVEL_NONE, &comp); BT_ASSERT(ret == 0); return comp; } @@ -547,18 +400,15 @@ const bt_component_sink *create_sink(bt_graph *graph) static bt_graph *create_graph(void) { - bt_graph *graph = bt_graph_create(); + bt_graph *graph = bt_graph_create(0); int ret; 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); - BT_ASSERT(ret >= 0); - ret = bt_graph_add_source_sink_component_ports_connected_listener( - graph, graph_src_sink_ports_connected, NULL, NULL, NULL); + graph, graph_sink_input_port_added, NULL, NULL); BT_ASSERT(ret >= 0); return graph; } @@ -586,12 +436,8 @@ void test_src_adds_port_in_port_connected(void) const bt_port *gsrc_hello_port; const bt_port *gsink_def_port; struct event event; - bt_graph_status status; - size_t src_accept_port_connection_pos; - size_t sink_accept_port_connection_pos; + bt_graph_connect_ports_status status; size_t src_port_connected_pos; - size_t sink_port_connected_pos; - size_t graph_ports_connected_pos; size_t graph_port_added_src_pos; prepare_test(TEST_SRC_ADDS_PORT_IN_PORT_CONNECTED, @@ -618,8 +464,8 @@ void test_src_adds_port_in_port_connected(void) gsrc_hello_port = bt_port_output_as_port_const(src_hello_port); gsink_def_port = bt_port_input_as_port_const(sink_def_port); - /* We're supposed to have 8 events */ - ok(events->len == 8, "we have the expected number of events"); + /* We're supposed to have 5 events */ + ok(events->len == 5, "we have the expected number of events"); /* Source's port added */ event.type = GRAPH_SRC_OUTPUT_PORT_ADDED; @@ -633,22 +479,6 @@ void test_src_adds_port_in_port_connected(void) event.data.graph_sink_input_port_added.port = gsink_def_port; ok(has_event(&event), "got the expected graph's port added event (for sink, initial)"); - /* Source's accept port connection */ - event.type = SRC_COMP_ACCEPT_OUTPUT_PORT_CONNECTION; - event.data.src_comp_accept_output_port_connection.comp = gsrc; - event.data.src_comp_accept_output_port_connection.self_port = gsrc_def_port; - event.data.src_comp_accept_output_port_connection.other_port = gsink_def_port; - ok(has_event(&event), "got the expected source's accept port connection event"); - src_accept_port_connection_pos = event_pos(&event); - - /* Sink's accept port connection */ - event.type = SINK_COMP_ACCEPT_INPUT_PORT_CONNECTION; - event.data.sink_comp_accept_input_port_connection.comp = gsink; - event.data.sink_comp_accept_input_port_connection.self_port = gsink_def_port; - event.data.sink_comp_accept_input_port_connection.other_port = gsrc_def_port; - ok(has_event(&event), "got the expected sink's accept port connection event"); - sink_accept_port_connection_pos = event_pos(&event); - /* Source's port connected */ event.type = SRC_COMP_OUTPUT_PORT_CONNECTED; event.data.src_comp_output_port_connected.comp = gsrc; @@ -670,30 +500,10 @@ void test_src_adds_port_in_port_connected(void) event.data.sink_comp_input_port_connected.self_port = gsink_def_port; event.data.sink_comp_input_port_connected.other_port = gsrc_def_port; ok(has_event(&event), "got the expected sink's port connected event"); - sink_port_connected_pos = event_pos(&event); - - /* Graph's ports connected */ - event.type = GRAPH_SRC_SINK_PORTS_CONNECTED; - event.data.graph_src_sink_ports_connected.upstream_comp = gsrc; - event.data.graph_src_sink_ports_connected.downstream_comp = gsink; - event.data.graph_src_sink_ports_connected.upstream_port = gsrc_def_port; - event.data.graph_src_sink_ports_connected.downstream_port = gsink_def_port; - ok(has_event(&event), "got the expected graph's ports connected event"); - graph_ports_connected_pos = event_pos(&event); /* Order of events */ - ok(src_port_connected_pos < graph_ports_connected_pos, - "event order is good (1)"); - ok(sink_port_connected_pos < graph_ports_connected_pos, - "event order is good (2)"); - ok(src_accept_port_connection_pos < src_port_connected_pos, - "event order is good (3)"); - ok(sink_accept_port_connection_pos < sink_port_connected_pos, - "event order is good (4)"); ok(src_port_connected_pos < graph_port_added_src_pos, - "event order is good (5)"); - ok(graph_port_added_src_pos < graph_ports_connected_pos, - "event order is good (6)"); + "event order is good"); bt_component_source_put_ref(src); bt_component_sink_put_ref(sink); @@ -713,12 +523,7 @@ void test_simple(void) const bt_port *gsrc_def_port; const bt_port *gsink_def_port; struct event event; - bt_graph_status status; - size_t src_accept_port_connection_pos; - size_t sink_accept_port_connection_pos; - size_t src_port_connected_pos; - size_t sink_port_connected_pos; - size_t graph_ports_connected_pos; + bt_graph_connect_ports_status status; prepare_test(TEST_SIMPLE, "simple"); graph = create_graph(); @@ -739,8 +544,8 @@ void test_simple(void) gsrc_def_port = bt_port_output_as_port_const(src_def_port); gsink_def_port = bt_port_input_as_port_const(sink_def_port); - /* We're supposed to have 7 events */ - ok(events->len == 7, "we have the expected number of events"); + /* We're supposed to have 4 events */ + ok(events->len == 4, "we have the expected number of events"); /* Source's port added */ event.type = GRAPH_SRC_OUTPUT_PORT_ADDED; @@ -754,29 +559,12 @@ void test_simple(void) event.data.graph_sink_input_port_added.port = gsink_def_port; ok(has_event(&event), "got the expected graph's port added event (for sink, initial)"); - /* Source's accept port connection */ - event.type = SRC_COMP_ACCEPT_OUTPUT_PORT_CONNECTION; - event.data.src_comp_accept_output_port_connection.comp = gsrc; - event.data.src_comp_accept_output_port_connection.self_port = gsrc_def_port; - event.data.src_comp_accept_output_port_connection.other_port = gsink_def_port; - ok(has_event(&event), "got the expected source's accept port connection event"); - src_accept_port_connection_pos = event_pos(&event); - - /* Sink's accept port connection */ - event.type = SINK_COMP_ACCEPT_INPUT_PORT_CONNECTION; - event.data.sink_comp_accept_input_port_connection.comp = gsink; - event.data.sink_comp_accept_input_port_connection.self_port = gsink_def_port; - event.data.sink_comp_accept_input_port_connection.other_port = gsrc_def_port; - ok(has_event(&event), "got the expected sink's accept port connection event"); - sink_accept_port_connection_pos = event_pos(&event); - /* Source's port connected */ event.type = SRC_COMP_OUTPUT_PORT_CONNECTED; event.data.src_comp_output_port_connected.comp = gsrc; event.data.src_comp_output_port_connected.self_port = gsrc_def_port; event.data.src_comp_output_port_connected.other_port = gsink_def_port; ok(has_event(&event), "got the expected source's port connected event"); - src_port_connected_pos = event_pos(&event); /* Sink's port connected */ event.type = SINK_COMP_INPUT_PORT_CONNECTED; @@ -784,26 +572,6 @@ void test_simple(void) event.data.sink_comp_input_port_connected.self_port = gsink_def_port; event.data.sink_comp_input_port_connected.other_port = gsrc_def_port; ok(has_event(&event), "got the expected sink's port connected event"); - sink_port_connected_pos = event_pos(&event); - - /* Graph's ports connected */ - event.type = GRAPH_SRC_SINK_PORTS_CONNECTED; - event.data.graph_src_sink_ports_connected.upstream_comp = gsrc; - event.data.graph_src_sink_ports_connected.downstream_comp = gsink; - event.data.graph_src_sink_ports_connected.upstream_port = gsrc_def_port; - event.data.graph_src_sink_ports_connected.downstream_port = gsink_def_port; - ok(has_event(&event), "got the expected graph's ports connected event"); - graph_ports_connected_pos = event_pos(&event); - - /* Order of events */ - ok(src_port_connected_pos < graph_ports_connected_pos, - "event order is good (1)"); - ok(sink_port_connected_pos < graph_ports_connected_pos, - "event order is good (2)"); - ok(src_accept_port_connection_pos < src_port_connected_pos, - "event order is good (3)"); - ok(sink_accept_port_connection_pos < sink_port_connected_pos, - "event order is good (4)"); bt_component_sink_put_ref(sink); bt_graph_put_ref(graph); @@ -824,9 +592,7 @@ void test_src_port_connected_error(void) const bt_port *gsink_def_port; const bt_connection *conn = NULL; struct event event; - bt_graph_status status; - size_t src_accept_port_connection_pos; - size_t src_port_connected_pos; + bt_graph_connect_ports_status status; prepare_test(TEST_SRC_PORT_CONNECTED_ERROR, "port connected error: source"); graph = create_graph(); @@ -841,16 +607,17 @@ void test_src_port_connected_error(void) BT_ASSERT(sink_def_port); status = bt_graph_connect_ports(graph, src_def_port, sink_def_port, &conn); - ok(status != BT_GRAPH_STATUS_OK, + ok(status != BT_GRAPH_CONNECT_PORTS_STATUS_OK, "bt_graph_connect_ports() returns an error"); + bt_current_thread_clear_error(); ok(!conn, "returned connection is still NULL"); gsrc = bt_component_source_as_component_const(src); gsink = bt_component_sink_as_component_const(sink); gsrc_def_port = bt_port_output_as_port_const(src_def_port); gsink_def_port = bt_port_input_as_port_const(sink_def_port); - /* We're supposed to have 5 events */ - ok(events->len == 5, "we have the expected number of events"); + /* We're supposed to have 3 events */ + ok(events->len == 3, "we have the expected number of events"); /* Source's port added */ event.type = GRAPH_SRC_OUTPUT_PORT_ADDED; @@ -864,32 +631,12 @@ void test_src_port_connected_error(void) event.data.graph_sink_input_port_added.port = gsink_def_port; ok(has_event(&event), "got the expected graph's port added event (for sink, initial)"); - /* Source's accept port connection */ - event.type = SRC_COMP_ACCEPT_OUTPUT_PORT_CONNECTION; - event.data.src_comp_accept_output_port_connection.comp = gsrc; - event.data.src_comp_accept_output_port_connection.self_port = gsrc_def_port; - event.data.src_comp_accept_output_port_connection.other_port = gsink_def_port; - ok(has_event(&event), "got the expected source's accept port connection event"); - src_accept_port_connection_pos = event_pos(&event); - - /* Sink's accept port connection */ - event.type = SINK_COMP_ACCEPT_INPUT_PORT_CONNECTION; - event.data.sink_comp_accept_input_port_connection.comp = gsink; - event.data.sink_comp_accept_input_port_connection.self_port = gsink_def_port; - event.data.sink_comp_accept_input_port_connection.other_port = gsrc_def_port; - ok(has_event(&event), "got the expected sink's accept port connection event"); - /* Source's port connected */ event.type = SRC_COMP_OUTPUT_PORT_CONNECTED; event.data.src_comp_output_port_connected.comp = gsrc; event.data.src_comp_output_port_connected.self_port = gsrc_def_port; event.data.src_comp_output_port_connected.other_port = gsink_def_port; ok(has_event(&event), "got the expected source's port connected event"); - src_port_connected_pos = event_pos(&event); - - /* Order of events */ - ok(src_accept_port_connection_pos < src_port_connected_pos, - "event order is good (1)"); bt_graph_put_ref(graph); bt_component_sink_put_ref(sink); @@ -911,11 +658,7 @@ void test_sink_port_connected_error(void) const bt_port *gsink_def_port; const bt_connection *conn = NULL; struct event event; - bt_graph_status status; - size_t src_accept_port_connection_pos; - size_t sink_accept_port_connection_pos; - size_t src_port_connected_pos; - size_t sink_port_connected_pos; + bt_graph_connect_ports_status status; prepare_test(TEST_SINK_PORT_CONNECTED_ERROR, "port connected error: sink"); graph = create_graph(); @@ -930,16 +673,17 @@ void test_sink_port_connected_error(void) BT_ASSERT(sink_def_port); status = bt_graph_connect_ports(graph, src_def_port, sink_def_port, &conn); - ok(status != BT_GRAPH_STATUS_OK, + ok(status != BT_GRAPH_CONNECT_PORTS_STATUS_OK, "bt_graph_connect_ports() returns an error"); + bt_current_thread_clear_error(); ok(!conn, "returned connection is still NULL"); gsrc = bt_component_source_as_component_const(src); gsink = bt_component_sink_as_component_const(sink); gsrc_def_port = bt_port_output_as_port_const(src_def_port); gsink_def_port = bt_port_input_as_port_const(sink_def_port); - /* We're supposed to have 6 events */ - ok(events->len == 6, "we have the expected number of events"); + /* We're supposed to have 4 events */ + ok(events->len == 4, "we have the expected number of events"); /* Source's port added */ event.type = GRAPH_SRC_OUTPUT_PORT_ADDED; @@ -953,29 +697,12 @@ void test_sink_port_connected_error(void) event.data.graph_sink_input_port_added.port = gsink_def_port; ok(has_event(&event), "got the expected graph's port added event (for sink, initial)"); - /* Source's accept port connection */ - event.type = SRC_COMP_ACCEPT_OUTPUT_PORT_CONNECTION; - event.data.src_comp_accept_output_port_connection.comp = gsrc; - event.data.src_comp_accept_output_port_connection.self_port = gsrc_def_port; - event.data.src_comp_accept_output_port_connection.other_port = gsink_def_port; - ok(has_event(&event), "got the expected source's accept port connection event"); - src_accept_port_connection_pos = event_pos(&event); - - /* Sink's accept port connection */ - event.type = SINK_COMP_ACCEPT_INPUT_PORT_CONNECTION; - event.data.sink_comp_accept_input_port_connection.comp = gsink; - event.data.sink_comp_accept_input_port_connection.self_port = gsink_def_port; - event.data.sink_comp_accept_input_port_connection.other_port = gsrc_def_port; - ok(has_event(&event), "got the expected sink's accept port connection event"); - sink_accept_port_connection_pos = event_pos(&event); - /* Source's port connected */ event.type = SRC_COMP_OUTPUT_PORT_CONNECTED; event.data.src_comp_output_port_connected.comp = gsrc; event.data.src_comp_output_port_connected.self_port = gsrc_def_port; event.data.src_comp_output_port_connected.other_port = gsink_def_port; ok(has_event(&event), "got the expected source's port connected event"); - src_port_connected_pos = event_pos(&event); /* Sink's port connected */ event.type = SINK_COMP_INPUT_PORT_CONNECTED; @@ -983,13 +710,6 @@ void test_sink_port_connected_error(void) event.data.sink_comp_input_port_connected.self_port = gsink_def_port; event.data.sink_comp_input_port_connected.other_port = gsrc_def_port; ok(has_event(&event), "got the expected sink's port connected event"); - sink_port_connected_pos = event_pos(&event); - - /* Order of events */ - ok(src_accept_port_connection_pos < src_port_connected_pos, - "event order is good (1)"); - ok(sink_accept_port_connection_pos < sink_port_connected_pos, - "event order is good (2)"); bt_connection_put_ref(conn); bt_graph_put_ref(graph);