X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Ftest_ctf_writer.c;h=9a790bbc181b3c42b0a0e2918d91acd6f60f1d49;hb=a9f0d01b276e2bb637ad4bea1e8863e144911f55;hp=7ea4b5831638b646108c1a712d7296f9c38b0d50;hpb=4026c9e26ceced4188ac47b389d2129779236b0b;p=babeltrace.git

diff --git a/tests/lib/test_ctf_writer.c b/tests/lib/test_ctf_writer.c
index 7ea4b583..9a790bbc 100644
--- a/tests/lib/test_ctf_writer.c
+++ b/tests/lib/test_ctf_writer.c
@@ -61,7 +61,7 @@
 #define DEFAULT_CLOCK_TIME 0
 #define DEFAULT_CLOCK_VALUE 0
 
-#define NR_TESTS 611
+#define NR_TESTS 607
 
 static int64_t current_time = 42;
 
@@ -434,17 +434,6 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class,
 		"bt_ctf_stream_class_get_event_class_by_id returns a correct event class");
 	bt_put(ret_event_class);
 
-	ok(bt_ctf_stream_class_get_event_class_by_name(NULL, "some event name") == NULL,
-		"bt_ctf_stream_class_get_event_class_by_name handles a NULL stream class correctly");
-	ok(bt_ctf_stream_class_get_event_class_by_name(stream_class, NULL) == NULL,
-		"bt_ctf_stream_class_get_event_class_by_name handles a NULL event class name correctly");
-	ok(bt_ctf_stream_class_get_event_class_by_name(stream_class, "some event name") == NULL,
-		"bt_ctf_stream_class_get_event_class_by_name handles non-existing event class names correctly");
-	ret_event_class = bt_ctf_stream_class_get_event_class_by_name(stream_class, "Simple Event");
-	ok(ret_event_class == simple_event_class,
-		"bt_ctf_stream_class_get_event_class_by_name returns a correct event class");
-	bt_put(ret_event_class);
-
 	simple_event = bt_ctf_event_create(simple_event_class);
 	ok(simple_event,
 		"Instantiate an event containing a single integer field");
@@ -2500,8 +2489,8 @@ void append_existing_event_class(struct bt_ctf_stream_class *stream_class)
 
 	event_class = bt_ctf_event_class_create("Simple Event");
 	assert(event_class);
-	ok(bt_ctf_stream_class_add_event_class(stream_class, event_class),
-		"two event classes with the same name cannot cohabit within the same stream class");
+	ok(bt_ctf_stream_class_add_event_class(stream_class, event_class) == 0,
+		"two event classes with the same name may cohabit within the same stream class");
 	bt_put(event_class);
 
 	event_class = bt_ctf_event_class_create("different name, ok");