X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Ftest_simple_sink.c;h=b12ab35a6a41aa9caaac0b913f248d1d36b39346;hb=fbd8a4e0144aa7777bedcd8c05daec61d594634d;hp=2ea92a846d30a29be6a2c83902411d9a1fc3cb79;hpb=e3250e619376d8a194bbb8e8c5e7450655f3fc66;p=babeltrace.git

diff --git a/tests/lib/test_simple_sink.c b/tests/lib/test_simple_sink.c
index 2ea92a84..b12ab35a 100644
--- a/tests/lib/test_simple_sink.c
+++ b/tests/lib/test_simple_sink.c
@@ -20,16 +20,16 @@
 #include <string.h>
 #include "tap/tap.h"
 
-#define NR_TESTS 60
+#define NR_TESTS 68
 
 struct test_data {
-	bt_graph_simple_sink_component_init_func_status init_status;
+	bt_graph_simple_sink_component_initialize_func_status init_status;
 	bt_graph_simple_sink_component_consume_func_status consume_status;
 };
 
 static
-bt_graph_simple_sink_component_init_func_status simple_init_func(
-		bt_self_component_port_input_message_iterator *iterator,
+bt_graph_simple_sink_component_initialize_func_status simple_INITIALIZE_func(
+		bt_message_iterator *iterator,
 		void *data)
 {
 	struct test_data *test_data = data;
@@ -41,7 +41,7 @@ bt_graph_simple_sink_component_init_func_status simple_init_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;
@@ -58,7 +58,7 @@ void simple_fini_func(void *data)
 }
 
 static
-bt_component_class_init_method_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)
@@ -68,21 +68,22 @@ bt_component_class_init_method_status src_init(
 	status = bt_self_component_source_add_output_port(self_comp,
 		"out", NULL, NULL);
 	BT_ASSERT(status == BT_SELF_COMPONENT_ADD_PORT_STATUS_OK);
-	return BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK;
+	return BT_COMPONENT_CLASS_INITIALIZE_METHOD_STATUS_OK;
 }
 
 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,9 +91,13 @@ 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_init_method(
+	set_method_status = bt_component_class_source_set_initialize_method(
 		src_comp_cls, src_init);
 	BT_ASSERT(set_method_status == BT_COMPONENT_CLASS_SET_METHOD_STATUS_OK);
 	graph = bt_graph_create(0);
@@ -106,12 +111,13 @@ bt_graph *create_graph_with_source(const bt_port_output **out_port)
 	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;
 }
 
 static
 void test_simple_expect_run_once_status(
-		bt_graph_simple_sink_component_init_func_status init_status,
+		bt_graph_simple_sink_component_initialize_func_status init_status,
 		bt_graph_simple_sink_component_consume_func_status consume_status,
 		bt_graph_run_once_status exp_run_once_status)
 {
@@ -126,29 +132,42 @@ 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_init_func, simple_consume_func, simple_fini_func,
+		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);
+
+	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_component_sink_put_ref(sink_comp);
 	bt_graph_put_ref(graph);
+	if (err) {
+		bt_error_release(err);
+	}
 }
 
 int main(void)
@@ -157,37 +176,37 @@ int main(void)
 
 	/* Test initialization function status */
 	test_simple_expect_run_once_status(
-		BT_GRAPH_SIMPLE_SINK_COMPONENT_INIT_FUNC_STATUS_OK,
+		BT_GRAPH_SIMPLE_SINK_COMPONENT_INITIALIZE_FUNC_STATUS_OK,
 		BT_GRAPH_SIMPLE_SINK_COMPONENT_CONSUME_FUNC_STATUS_OK,
 		BT_GRAPH_RUN_ONCE_STATUS_OK);
 	test_simple_expect_run_once_status(
-		BT_GRAPH_SIMPLE_SINK_COMPONENT_INIT_FUNC_STATUS_ERROR,
+		BT_GRAPH_SIMPLE_SINK_COMPONENT_INITIALIZE_FUNC_STATUS_ERROR,
 		BT_GRAPH_SIMPLE_SINK_COMPONENT_CONSUME_FUNC_STATUS_OK,
 		BT_GRAPH_RUN_ONCE_STATUS_ERROR);
 	test_simple_expect_run_once_status(
-		BT_GRAPH_SIMPLE_SINK_COMPONENT_INIT_FUNC_STATUS_MEMORY_ERROR,
+		BT_GRAPH_SIMPLE_SINK_COMPONENT_INITIALIZE_FUNC_STATUS_MEMORY_ERROR,
 		BT_GRAPH_SIMPLE_SINK_COMPONENT_CONSUME_FUNC_STATUS_OK,
 		BT_GRAPH_RUN_ONCE_STATUS_MEMORY_ERROR);
 
 	/* Test "consume" function status */
 	test_simple_expect_run_once_status(
-		BT_GRAPH_SIMPLE_SINK_COMPONENT_INIT_FUNC_STATUS_OK,
+		BT_GRAPH_SIMPLE_SINK_COMPONENT_INITIALIZE_FUNC_STATUS_OK,
 		BT_GRAPH_SIMPLE_SINK_COMPONENT_CONSUME_FUNC_STATUS_OK,
 		BT_GRAPH_RUN_ONCE_STATUS_OK);
 	test_simple_expect_run_once_status(
-		BT_GRAPH_SIMPLE_SINK_COMPONENT_INIT_FUNC_STATUS_OK,
+		BT_GRAPH_SIMPLE_SINK_COMPONENT_INITIALIZE_FUNC_STATUS_OK,
 		BT_GRAPH_SIMPLE_SINK_COMPONENT_CONSUME_FUNC_STATUS_ERROR,
 		BT_GRAPH_RUN_ONCE_STATUS_ERROR);
 	test_simple_expect_run_once_status(
-		BT_GRAPH_SIMPLE_SINK_COMPONENT_INIT_FUNC_STATUS_OK,
+		BT_GRAPH_SIMPLE_SINK_COMPONENT_INITIALIZE_FUNC_STATUS_OK,
 		BT_GRAPH_SIMPLE_SINK_COMPONENT_CONSUME_FUNC_STATUS_MEMORY_ERROR,
 		BT_GRAPH_RUN_ONCE_STATUS_MEMORY_ERROR);
 	test_simple_expect_run_once_status(
-		BT_GRAPH_SIMPLE_SINK_COMPONENT_INIT_FUNC_STATUS_OK,
+		BT_GRAPH_SIMPLE_SINK_COMPONENT_INITIALIZE_FUNC_STATUS_OK,
 		BT_GRAPH_SIMPLE_SINK_COMPONENT_CONSUME_FUNC_STATUS_AGAIN,
 		BT_GRAPH_RUN_ONCE_STATUS_AGAIN);
 	test_simple_expect_run_once_status(
-		BT_GRAPH_SIMPLE_SINK_COMPONENT_INIT_FUNC_STATUS_OK,
+		BT_GRAPH_SIMPLE_SINK_COMPONENT_INITIALIZE_FUNC_STATUS_OK,
 		BT_GRAPH_SIMPLE_SINK_COMPONENT_CONSUME_FUNC_STATUS_END,
 		BT_GRAPH_RUN_ONCE_STATUS_END);