assert-pre-internal.h: add BT_ASSERT_PRE_VALID_INDEX()

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

diff --git a/tests/lib/test_ctf_writer.c b/tests/lib/test_ctf_writer.c
index de0b6123d5092e106c2cac5a65408428fa0c0679..97c11cd38c2ecb055ddb0c6b0079372e21fc3878 100644 (file)
--- a/tests/lib/test_ctf_writer.c
+++ b/tests/lib/test_ctf_writer.c
@@ -57,7 +57,7 @@
 #define DEFAULT_CLOCK_TIME 0
 #define DEFAULT_CLOCK_VALUE 0
 
-#define NR_TESTS 346
+#define NR_TESTS 342
 
 struct bt_utsname {
        char sysname[BABELTRACE_HOST_NAME_MAX];
@@ -301,7 +301,8 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class,
        bt_ctf_event_class_add_field(simple_event_class, float_type,
                "float_field");
 
-       BT_ASSERT(!bt_ctf_event_class_set_id(simple_event_class, 13));
+       ret = bt_ctf_event_class_set_id(simple_event_class, 13);
+       BT_ASSERT(ret == 0);
 
        /* Set an event context type which will contain a single integer. */
        ok(!bt_ctf_field_type_structure_add_field(event_context_type, uint_12_type,
@@ -1536,6 +1537,7 @@ end:
 static
 void append_existing_event_class(struct bt_ctf_stream_class *stream_class)
 {
+       int ret;
        struct bt_ctf_event_class *event_class;
 
        event_class = bt_ctf_event_class_create("Simple Event");
@@ -1546,7 +1548,8 @@ void append_existing_event_class(struct bt_ctf_stream_class *stream_class)
 
        event_class = bt_ctf_event_class_create("different name, ok");
        BT_ASSERT(event_class);
-       BT_ASSERT(!bt_ctf_event_class_set_id(event_class, 13));
+       ret = bt_ctf_event_class_set_id(event_class, 13);
+       BT_ASSERT(ret == 0);
        ok(bt_ctf_stream_class_add_event_class(stream_class, event_class),
                "two event classes with the same ID cannot cohabit within the same stream class");
        bt_put(event_class);
@@ -1593,7 +1596,6 @@ int main(int argc, char **argv)
        struct bt_utsname name = {"GNU/Linux", "testhost", "4.4.0-87-generic",
                "#110-Ubuntu SMP Tue Jul 18 12:55:35 UTC 2017", "x86_64"};
        struct bt_ctf_clock *clock, *ret_clock;
-       struct bt_ctf_clock_class *ret_clock_class;
        struct bt_ctf_stream_class *stream_class, *ret_stream_class;
        struct bt_ctf_stream *stream1;
        struct bt_ctf_stream *stream;
@@ -2015,20 +2017,6 @@ int main(int argc, char **argv)
         * class to the writer's trace, thus registering the stream
         * class's clock to the trace.
         */
-       ok(bt_ctf_trace_get_clock_class_count(trace) == 1,
-               "bt_ctf_trace_get_clock_class_count returns the correct number of clocks");
-       ret_clock_class = bt_ctf_trace_get_clock_class_by_index(trace, 0);
-       ok(strcmp(bt_ctf_clock_class_get_name(ret_clock_class),
-               bt_ctf_clock_get_name(clock)) == 0,
-               "bt_ctf_trace_get_clock_class returns the right clock instance");
-       bt_put(ret_clock_class);
-       ret_clock_class = bt_ctf_trace_get_clock_class_by_name(trace, clock_name);
-       ok(strcmp(bt_ctf_clock_class_get_name(ret_clock_class),
-               bt_ctf_clock_get_name(clock)) == 0,
-               "bt_ctf_trace_get_clock_class returns the right clock instance");
-       bt_put(ret_clock_class);
-       ok(!bt_ctf_trace_get_clock_class_by_name(trace, "random"),
-               "bt_ctf_trace_get_clock_by_name fails when the requested clock doesn't exist");
 
        ret_stream_class = bt_ctf_stream_get_class(stream1);
        ok(ret_stream_class,