Fix: allow duplicate keys and overlapping ranges in enumerations
[babeltrace.git] / tests / lib / test_ctf_writer.c
index 35497bfd254efb060912e012d6d34615e4c9b816..2dd5596302210f9c3223e81c5dadb13cd1adf134 100644 (file)
@@ -27,6 +27,7 @@
 #include <babeltrace/ctf-writer/event-fields.h>
 #include <babeltrace/ctf-writer/stream-class.h>
 #include <babeltrace/ctf-ir/packet.h>
+#include <babeltrace/ctf-ir/clock-class.h>
 #include <babeltrace/ref.h>
 #include <babeltrace/ctf/events.h>
 #include <babeltrace/values.h>
@@ -44,7 +45,7 @@
 #include "tap/tap.h"
 #include <math.h>
 #include <float.h>
-#include <sys/stat.h>
+#include "common.h"
 
 #define METADATA_LINE_SIZE 512
 #define SEQUENCE_TEST_LENGTH 10
 #define DEFAULT_CLOCK_TIME 0
 #define DEFAULT_CLOCK_VALUE 0
 
-#define NR_TESTS 605
+#define NR_TESTS 600
 
 static int64_t current_time = 42;
 
-static
-void delete_trace(const char *trace_path)
-{
-       /* Remove all trace files and delete temporary trace directory */
-       struct dirent *entry;
-       DIR *trace_dir = opendir(trace_path);
-
-       if (!trace_dir) {
-               perror("# opendir");
-               return;
-       }
-
-       while ((entry = readdir(trace_dir))) {
-               struct stat st;
-               char filename[PATH_MAX];
-
-               if (snprintf(filename, sizeof(filename), "%s/%s",
-                            trace_path, entry->d_name) <= 0) {
-                       continue;
-               }
-
-               if (stat(filename, &st)) {
-                       continue;
-               }
-
-               if (S_ISREG(st.st_mode)) {
-                       unlinkat(bt_dirfd(trace_dir), entry->d_name, 0);
-               }
-       }
-
-       rmdir(trace_path);
-       closedir(trace_dir);
-}
-
 /* Return 1 if uuids match, zero if different. */
+static
 int uuid_match(const unsigned char *uuid_a, const unsigned char *uuid_b)
 {
        int ret = 0;
@@ -118,6 +86,7 @@ end:
        return ret;
 }
 
+static
 void validate_metadata(char *parser_path, char *metadata_path)
 {
        int ret = 0;
@@ -234,6 +203,7 @@ close_fp:
        }
 }
 
+static
 void validate_trace(char *parser_path, char *trace_path)
 {
        int ret = 0;
@@ -316,6 +286,7 @@ close_fp:
        }
 }
 
+static
 void append_simple_event(struct bt_ctf_stream_class *stream_class,
                struct bt_ctf_stream *stream, struct bt_ctf_clock *clock)
 {
@@ -349,7 +320,6 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class,
        double ret_double;
        int64_t ret_range_start_int64_t, ret_range_end_int64_t;
        uint64_t ret_range_start_uint64_t, ret_range_end_uint64_t;
-       struct bt_ctf_clock *ret_clock;
        struct bt_ctf_event_class *ret_event_class;
        struct bt_ctf_field *packet_context;
        struct bt_ctf_field *packet_context_field;
@@ -360,11 +330,13 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class,
        struct bt_ctf_field_type *ep_integer_field_type = NULL;
        struct bt_ctf_field_type *ep_enum_field_type = NULL;
        struct bt_ctf_field_type *ep_enum_field_unsigned_type = NULL;
+       struct bt_ctf_field_type_enumeration_mapping_iterator *iter = NULL;
        int ret;
 
        ok(uint_12_type, "Create an unsigned integer type");
 
-       bt_ctf_field_type_integer_set_signed(int_64_type, 1);
+       ok(!bt_ctf_field_type_integer_set_signed(int_64_type, 1),
+               "Set signed 64 bit integer signedness to true");
        ok(int_64_type, "Create a signed integer type");
        enum_type = bt_ctf_field_type_enumeration_create(int_64_type);
 
@@ -410,44 +382,50 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class,
        bt_ctf_field_type_enumeration_add_mapping(enum_type, mapping_name_test,
                42, 42);
        ok(bt_ctf_field_type_enumeration_add_mapping(enum_type, mapping_name_test,
-               43, 51), "bt_ctf_field_type_enumeration_add_mapping rejects duplicate mapping names");
+               43, 51) == 0, "bt_ctf_field_type_enumeration_add_mapping accepts duplicate mapping names");
        ok(bt_ctf_field_type_enumeration_add_mapping(enum_type, "something",
-               -500, -400), "bt_ctf_field_type_enumeration_add_mapping rejects overlapping enum entries");
+               -500, -400) == 0, "bt_ctf_field_type_enumeration_add_mapping accepts overlapping enum entries");
        ok(bt_ctf_field_type_enumeration_add_mapping(enum_type, mapping_name_test,
                -54, -55), "bt_ctf_field_type_enumeration_add_mapping rejects mapping where end < start");
        bt_ctf_field_type_enumeration_add_mapping(enum_type, "another entry", -42000, -13000);
 
-       ok(bt_ctf_field_type_enumeration_get_mapping_index_by_value(NULL, -42) < 0,
-               "bt_ctf_field_type_enumeration_get_mapping_index_by_value handles a NULL field type correctly");
-       ok(bt_ctf_field_type_enumeration_get_mapping_index_by_value(enum_type, 1000000) < 0,
-               "bt_ctf_field_type_enumeration_get_mapping_index_by_value handles invalid values correctly");
-       ok(bt_ctf_field_type_enumeration_get_mapping_index_by_value(enum_type, -55) == 1,
-               "bt_ctf_field_type_enumeration_get_mapping_index_by_value returns the correct index");
+       iter = bt_ctf_field_type_enumeration_find_mappings_by_signed_value(NULL, -42);
+       ok(iter == NULL, "bt_ctf_field_type_enumeration_find_mappings_by_signed_value handles a NULL field type correctly");
+
+       iter = bt_ctf_field_type_enumeration_find_mappings_by_signed_value(enum_type, -4200000);
+       ok(iter == NULL, "bt_ctf_field_type_enumeration_find_mappings_by_signed_value rejects non-mapped values");
+
+       iter = bt_ctf_field_type_enumeration_find_mappings_by_signed_value(enum_type, 3);
+       ok(iter != NULL, "bt_ctf_field_type_enumeration_find_mappings_by_signed_value succeeds with mapped value");
+       ok(bt_ctf_field_type_enumeration_mapping_iterator_get_signed(iter, NULL, NULL, NULL) == 0,
+               "bt_ctf_field_type_enumeration_mapping_iterator_get_signed handles mapped values correctly");
+       BT_PUT(iter);
 
        ok(bt_ctf_event_class_add_field(simple_event_class, enum_type,
                "enum_field") == 0, "Add signed enumeration field to event");
 
-       ok(bt_ctf_field_type_enumeration_get_mapping(NULL, 0, &ret_char,
+       ok(bt_ctf_field_type_enumeration_get_mapping_signed(NULL, 0, &ret_char,
                &ret_range_start_int64_t, &ret_range_end_int64_t) < 0,
-               "bt_ctf_field_type_enumeration_get_mapping handles a NULL enumeration correctly");
-       ok(bt_ctf_field_type_enumeration_get_mapping(enum_type, 0, NULL,
-               &ret_range_start_int64_t, &ret_range_end_int64_t) < 0,
-               "bt_ctf_field_type_enumeration_get_mapping handles a NULL string correctly");
-       ok(bt_ctf_field_type_enumeration_get_mapping(enum_type, 0, &ret_char,
-               NULL, &ret_range_end_int64_t) < 0,
-               "bt_ctf_field_type_enumeration_get_mapping handles a NULL start correctly");
-       ok(bt_ctf_field_type_enumeration_get_mapping(enum_type, 0, &ret_char,
-               &ret_range_start_int64_t, NULL) < 0,
-               "bt_ctf_field_type_enumeration_get_mapping handles a NULL end correctly");
-       ok(bt_ctf_field_type_enumeration_get_mapping(enum_type, 5, &ret_char,
+               "bt_ctf_field_type_enumeration_get_mapping_signed handles a NULL enumeration correctly");
+       ok(bt_ctf_field_type_enumeration_get_mapping_signed(enum_type, 0, NULL,
+               &ret_range_start_int64_t, &ret_range_end_int64_t) == 0,
+               "bt_ctf_field_type_enumeration_get_mapping_signed handles a NULL string correctly");
+       ok(bt_ctf_field_type_enumeration_get_mapping_signed(enum_type, 0, &ret_char,
+               NULL, &ret_range_end_int64_t) == 0,
+               "bt_ctf_field_type_enumeration_get_mapping_signed handles a NULL start correctly");
+       ok(bt_ctf_field_type_enumeration_get_mapping_signed(enum_type, 0, &ret_char,
+               &ret_range_start_int64_t, NULL) == 0,
+               "bt_ctf_field_type_enumeration_get_mapping_signed handles a NULL end correctly");
+       /* Assumes entries are sorted by range_start values. */
+       ok(bt_ctf_field_type_enumeration_get_mapping_signed(enum_type, 6, &ret_char,
                &ret_range_start_int64_t, &ret_range_end_int64_t) == 0,
-               "bt_ctf_field_type_enumeration_get_mapping returns a value");
+               "bt_ctf_field_type_enumeration_get_mapping_signed returns a value");
        ok(!strcmp(ret_char, mapping_name_test),
-               "bt_ctf_field_type_enumeration_get_mapping returns a correct mapping name");
+               "bt_ctf_field_type_enumeration_get_mapping_signed returns a correct mapping name");
        ok(ret_range_start_int64_t == 42,
-               "bt_ctf_field_type_enumeration_get_mapping returns a correct mapping start");
+               "bt_ctf_field_type_enumeration_get_mapping_signed returns a correct mapping start");
        ok(ret_range_end_int64_t == 42,
-               "bt_ctf_field_type_enumeration_get_mapping returns a correct mapping end");
+               "bt_ctf_field_type_enumeration_get_mapping_signed returns a correct mapping end");
 
        ok(bt_ctf_field_type_enumeration_add_mapping_unsigned(enum_type_unsigned,
                "escaping; \"test\"", 0, 0) == 0,
@@ -461,9 +439,9 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class,
        bt_ctf_field_type_enumeration_add_mapping_unsigned(enum_type_unsigned, mapping_name_test,
                42, 42);
        ok(bt_ctf_field_type_enumeration_add_mapping_unsigned(enum_type_unsigned, mapping_name_test,
-               43, 51), "bt_ctf_field_type_enumeration_add_mapping_unsigned rejects duplicate mapping names");
+               43, 51) == 0, "bt_ctf_field_type_enumeration_add_mapping_unsigned accepts duplicate mapping names");
        ok(bt_ctf_field_type_enumeration_add_mapping_unsigned(enum_type_unsigned, "something",
-               7, 8), "bt_ctf_field_type_enumeration_add_mapping_unsigned rejects overlapping enum entries");
+               7, 8) == 0, "bt_ctf_field_type_enumeration_add_mapping_unsigned accepts overlapping enum entries");
        ok(bt_ctf_field_type_enumeration_add_mapping_unsigned(enum_type_unsigned, mapping_name_test,
                55, 54), "bt_ctf_field_type_enumeration_add_mapping_unsigned rejects mapping where end < start");
        ok(bt_ctf_event_class_add_field(simple_event_class, enum_type_unsigned,
@@ -471,22 +449,22 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class,
 
        ok(bt_ctf_field_type_enumeration_get_mapping_count(NULL) < 0,
                "bt_ctf_field_type_enumeration_get_mapping_count handles NULL correctly");
-       ok(bt_ctf_field_type_enumeration_get_mapping_count(enum_type_unsigned) == 4,
+       ok(bt_ctf_field_type_enumeration_get_mapping_count(enum_type_unsigned) == 6,
                "bt_ctf_field_type_enumeration_get_mapping_count returns the correct value");
 
        ok(bt_ctf_field_type_enumeration_get_mapping_unsigned(NULL, 0, &ret_char,
                &ret_range_start_uint64_t, &ret_range_end_uint64_t) < 0,
                "bt_ctf_field_type_enumeration_get_mapping_unsigned handles a NULL enumeration correctly");
        ok(bt_ctf_field_type_enumeration_get_mapping_unsigned(enum_type_unsigned, 0, NULL,
-               &ret_range_start_uint64_t, &ret_range_end_uint64_t) < 0,
+               &ret_range_start_uint64_t, &ret_range_end_uint64_t) == 0,
                "bt_ctf_field_type_enumeration_get_mapping_unsigned handles a NULL string correctly");
        ok(bt_ctf_field_type_enumeration_get_mapping_unsigned(enum_type_unsigned, 0, &ret_char,
-               NULL, &ret_range_end_uint64_t) < 0,
+               NULL, &ret_range_end_uint64_t) == 0,
                "bt_ctf_field_type_enumeration_get_mapping_unsigned handles a NULL start correctly");
        ok(bt_ctf_field_type_enumeration_get_mapping_unsigned(enum_type_unsigned, 0, &ret_char,
-               &ret_range_start_uint64_t, NULL) < 0,
+               &ret_range_start_uint64_t, NULL) == 0,
                "bt_ctf_field_type_enumeration_get_mapping_unsigned handles a NULL end correctly");
-       ok(bt_ctf_field_type_enumeration_get_mapping_unsigned(enum_type_unsigned, 3, &ret_char,
+       ok(bt_ctf_field_type_enumeration_get_mapping_unsigned(enum_type_unsigned, 4, &ret_char,
                &ret_range_start_uint64_t, &ret_range_end_uint64_t) == 0,
                "bt_ctf_field_type_enumeration_get_mapping_unsigned returns a value");
        ok(!strcmp(ret_char, mapping_name_test),
@@ -503,7 +481,7 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class,
 
        assert(!bt_ctf_event_class_set_id(simple_event_class, 13));
 
-       /* Set an event context type which will contain a single integer*/
+       /* 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,
                "event_specific_context"),
                "Add event specific context field");
@@ -512,8 +490,6 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class,
        ok(bt_ctf_event_class_get_context_type(simple_event_class) == NULL,
                "bt_ctf_event_class_get_context_type returns NULL when no event context type is set");
 
-       ok(bt_ctf_event_class_set_context_type(simple_event_class, NULL) < 0,
-               "bt_ctf_event_class_set_context_type handles a NULL context type correctly");
        ok(bt_ctf_event_class_set_context_type(NULL, event_context_type) < 0,
                "bt_ctf_event_class_set_context_type handles a NULL event class correctly");
        ok(!bt_ctf_event_class_set_context_type(simple_event_class, event_context_type),
@@ -523,7 +499,8 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class,
                "bt_ctf_event_class_get_context_type returns the appropriate type");
        bt_put(returned_type);
 
-       bt_ctf_stream_class_add_event_class(stream_class, simple_event_class);
+       ok(!bt_ctf_stream_class_add_event_class(stream_class, simple_event_class),
+               "Adding simple event class to stream class");
 
        /*
         * bt_ctf_stream_class_add_event_class() copies the field types
@@ -588,13 +565,6 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class,
        ok(simple_event,
                "Instantiate an event containing a single integer field");
 
-       ok(bt_ctf_event_get_clock(NULL) == NULL,
-               "bt_ctf_event_get_clock handles NULL correctly");
-       ret_clock = bt_ctf_event_get_clock(simple_event);
-       ok(ret_clock == clock,
-               "bt_ctf_event_get_clock returns a correct clock");
-       bt_put(clock);
-
        integer_field = bt_ctf_field_create(ep_integer_field_type);
        bt_ctf_field_unsigned_integer_set_value(integer_field, 42);
        ok(bt_ctf_event_set_payload(simple_event, "integer_field",
@@ -615,18 +585,19 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class,
 
        enum_field = bt_ctf_field_create(ep_enum_field_type);
        assert(enum_field);
-       ret_char = bt_ctf_field_enumeration_get_mapping_name(NULL);
-       ok(!ret_char, "bt_ctf_field_enumeration_get_mapping_name handles NULL correctly");
-       ret_char = bt_ctf_field_enumeration_get_mapping_name(enum_field);
-       ok(!ret_char, "bt_ctf_field_enumeration_get_mapping_name returns NULL if the enumeration's container field is unset");
+
+       ret_char = bt_ctf_field_enumeration_get_single_mapping_name(NULL);
+       ok(!ret_char, "bt_ctf_field_enumeration_get_single_mapping_name handles NULL correctly");
+       ret_char = bt_ctf_field_enumeration_get_single_mapping_name(enum_field);
+       ok(!ret_char, "bt_ctf_field_enumeration_get_single_mapping_name returns NULL if the enumeration's container field is unset");
        enum_container_field = bt_ctf_field_enumeration_get_container(
                enum_field);
        ok(bt_ctf_field_signed_integer_set_value(
                enum_container_field, -42) == 0,
                "Set signed enumeration container value");
-       ret_char = bt_ctf_field_enumeration_get_mapping_name(enum_field);
+       ret_char = bt_ctf_field_enumeration_get_single_mapping_name(enum_field);
        ok(!strcmp(ret_char, mapping_name_negative_test),
-               "bt_ctf_field_enumeration_get_mapping_name returns the correct mapping name with an signed container");
+               "bt_ctf_field_enumeration_get_single_mapping_name returns the correct mapping name with an signed container");
        ret = bt_ctf_event_set_payload(simple_event, "enum_field", enum_field);
        assert(!ret);
 
@@ -640,9 +611,9 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class,
        ret = bt_ctf_event_set_payload(simple_event, "enum_field_unsigned",
                enum_field_unsigned);
        assert(!ret);
-       ret_char = bt_ctf_field_enumeration_get_mapping_name(enum_field_unsigned);
+       ret_char = bt_ctf_field_enumeration_get_single_mapping_name(enum_field_unsigned);
        ok(ret_char && !strcmp(ret_char, mapping_name_test),
-               "bt_ctf_field_enumeration_get_mapping_name returns the correct mapping name with an unsigned container");
+               "bt_ctf_field_enumeration_get_single_mapping_name returns the correct mapping name with an unsigned container");
 
        ok(bt_ctf_clock_set_time(clock, current_time) == 0, "Set clock time");
 
@@ -732,6 +703,7 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class,
        bt_put(ep_enum_field_unsigned_type);
 }
 
+static
 void append_complex_event(struct bt_ctf_stream_class *stream_class,
                struct bt_ctf_stream *stream, struct bt_ctf_clock *clock)
 {
@@ -786,6 +758,7 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class,
        struct bt_ctf_stream_class *ret_stream_class;
        struct bt_ctf_event_class *ret_event_class;
        struct bt_ctf_field *packet_context, *packet_context_field;
+       struct bt_ctf_field_type_enumeration_mapping_iterator *iter = NULL;
        struct bt_value *obj;
 
        ok(bt_ctf_field_type_set_alignment(int_16_type, 0),
@@ -796,10 +769,13 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class,
                "bt_ctf_field_type_set_alignment handles wrong alignment correctly (24)");
        ok(!bt_ctf_field_type_set_alignment(int_16_type, 4),
                "bt_ctf_field_type_set_alignment handles correct alignment correctly (4)");
-       bt_ctf_field_type_set_alignment(int_16_type, 32);
-       bt_ctf_field_type_integer_set_signed(int_16_type, 1);
-       bt_ctf_field_type_integer_set_base(uint_35_type,
-               BT_CTF_INTEGER_BASE_HEXADECIMAL);
+       ok(!bt_ctf_field_type_set_alignment(int_16_type, 32),
+               "Set alignment of signed 16 bit integer to 32");
+       ok(!bt_ctf_field_type_integer_set_signed(int_16_type, 1),
+               "Set integer signedness to true");
+       ok(!bt_ctf_field_type_integer_set_base(uint_35_type,
+               BT_CTF_INTEGER_BASE_HEXADECIMAL),
+               "Set signed 16 bit integer base to hexadecimal");
 
        array_type = bt_ctf_field_type_array_create(int_16_type, ARRAY_TEST_LENGTH);
        sequence_type = bt_ctf_field_type_sequence_create(int_16_type,
@@ -818,12 +794,14 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class,
        ok(bt_ctf_field_type_array_get_length(array_type) == ARRAY_TEST_LENGTH,
                "bt_ctf_field_type_array_get_length returns the correct length");
 
-       bt_ctf_field_type_structure_add_field(inner_structure_type,
-               uint_35_type, "seq_len");
-       bt_ctf_field_type_structure_add_field(inner_structure_type,
-               sequence_type, "a_sequence");
-       bt_ctf_field_type_structure_add_field(inner_structure_type,
-               array_type, "an_array");
+       ok(bt_ctf_field_type_structure_add_field(inner_structure_type,
+               inner_structure_type, "yes"), "Cannot add self to structure");
+       ok(!bt_ctf_field_type_structure_add_field(inner_structure_type,
+               uint_35_type, "seq_len"), "Add seq_len field to inner structure");
+       ok(!bt_ctf_field_type_structure_add_field(inner_structure_type,
+               sequence_type, "a_sequence"), "Add a_sequence field to inner structure");
+       ok(!bt_ctf_field_type_structure_add_field(inner_structure_type,
+               array_type, "an_array"), "Add an_array field to inner structure");
 
        bt_ctf_field_type_enumeration_add_mapping(enum_variant_type,
                "UINT3_TYPE", 0, 0);
@@ -832,31 +810,41 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class,
        bt_ctf_field_type_enumeration_add_mapping(enum_variant_type,
                "UINT35_TYPE", 2, 7);
 
-       ok(bt_ctf_field_type_enumeration_get_mapping_index_by_name(NULL,
-               "INT16_TYPE") < 0,
-               "bt_ctf_field_type_enumeration_get_mapping_index_by_name handles a NULL field type correctly");
-       ok(bt_ctf_field_type_enumeration_get_mapping_index_by_name(
-               enum_variant_type, NULL) < 0,
-               "bt_ctf_field_type_enumeration_get_mapping_index_by_name handles a NULL name correctly");
-       ok(bt_ctf_field_type_enumeration_get_mapping_index_by_name(
-               enum_variant_type, "INT16_TYPE") == 1,
-               "bt_ctf_field_type_enumeration_get_mapping_index_by_name returns the correct index");
-
-       ok(bt_ctf_field_type_enumeration_get_mapping_index_by_unsigned_value(NULL, 1) < 0,
-               "bt_ctf_field_type_enumeration_get_mapping_index_by_unsigned_value handles a NULL field type correctly");
-       ok(bt_ctf_field_type_enumeration_get_mapping_index_by_unsigned_value(enum_variant_type, -42) < 0,
-               "bt_ctf_field_type_enumeration_get_mapping_index_by_unsigned_value handles invalid values correctly");
-       ok(bt_ctf_field_type_enumeration_get_mapping_index_by_unsigned_value(enum_variant_type, 5) == 2,
-               "bt_ctf_field_type_enumeration_get_mapping_index_by_unsigned_value returns the correct index");
+       iter = bt_ctf_field_type_enumeration_find_mappings_by_name(NULL, "INT16_TYPE");
+       ok(iter == NULL, "bt_ctf_field_type_enumeration_find_mappings_by_name handles a NULL field type correctly");
+
+       iter = bt_ctf_field_type_enumeration_find_mappings_by_name(enum_variant_type, "INT16_TYPE");
+       ok(iter != NULL, "bt_ctf_field_type_enumeration_find_mappings_by_name handles an existing mapping correctly");
+       ok(bt_ctf_field_type_enumeration_mapping_iterator_get_unsigned(iter, NULL, NULL, NULL) == 0,
+               "bt_ctf_field_type_enumeration_mapping_iterator_get_unsigned handles mapped values correctly");
+       BT_PUT(iter);
+
+       iter = bt_ctf_field_type_enumeration_find_mappings_by_name(enum_variant_type, NULL);
+       ok(iter == NULL, "bt_ctf_field_type_enumeration_find_mappings_by_name handles a NULL name correctly");
+
+       iter = bt_ctf_field_type_enumeration_find_mappings_by_unsigned_value(NULL, 1);
+       ok(iter == NULL, "bt_ctf_field_type_enumeration_find_mappings_by_unsigned_value handles a NULL field type correctly");
+
+       iter = bt_ctf_field_type_enumeration_find_mappings_by_unsigned_value(enum_variant_type, -42);
+       ok(iter == NULL, "bt_ctf_field_type_enumeration_find_mappings_by_unsigned_value handles invalid values correctly");
+       ok(bt_ctf_field_type_enumeration_mapping_iterator_get_unsigned(iter, NULL, NULL, NULL) != 0,
+               "bt_ctf_field_type_enumeration_mapping_iterator_get_unsigned handles invalid values correctly");
+       BT_PUT(iter);
+
+       iter = bt_ctf_field_type_enumeration_find_mappings_by_unsigned_value(enum_variant_type, 5);
+       ok(iter != NULL, "bt_ctf_field_type_enumeration_find_mappings_by_unsigned_value handles valid values correctly");
+       ok(bt_ctf_field_type_enumeration_mapping_iterator_get_unsigned(iter, NULL, NULL, NULL) == 0,
+               "bt_ctf_field_type_enumeration_mapping_iterator_get_unsigned handles valid values correctly");
+       BT_PUT(iter);
 
        ok(bt_ctf_field_type_variant_add_field(variant_type, uint_3_type,
                "An unknown entry"), "Reject a variant field based on an unknown tag value");
        ok(bt_ctf_field_type_variant_add_field(variant_type, uint_3_type,
                "UINT3_TYPE") == 0, "Add a field to a variant");
-       bt_ctf_field_type_variant_add_field(variant_type, int_16_type,
-               "INT16_TYPE");
-       bt_ctf_field_type_variant_add_field(variant_type, uint_35_type,
-               "UINT35_TYPE");
+       ok(!bt_ctf_field_type_variant_add_field(variant_type, int_16_type,
+               "INT16_TYPE"), "Add INT16_TYPE field to variant");
+       ok(!bt_ctf_field_type_variant_add_field(variant_type, uint_35_type,
+               "UINT35_TYPE"), "Add UINT35_TYPE field to variant");
 
        ok(bt_ctf_field_type_variant_get_tag_type(NULL) == NULL,
                "bt_ctf_field_type_variant_get_tag_type handles NULL correctly");
@@ -904,14 +892,17 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class,
                "bt_ctf_field_type_variant_get_field returns a correct field type");
        bt_put(ret_field_type);
 
-       bt_ctf_field_type_structure_add_field(complex_structure_type,
-               enum_variant_type, "variant_selector");
-       bt_ctf_field_type_structure_add_field(complex_structure_type,
-               string_type, "a_string");
-       bt_ctf_field_type_structure_add_field(complex_structure_type,
-               variant_type, "variant_value");
-       bt_ctf_field_type_structure_add_field(complex_structure_type,
-               inner_structure_type, "inner_structure");
+       ok(!bt_ctf_field_type_structure_add_field(complex_structure_type,
+               enum_variant_type, "variant_selector"),
+               "Add variant_selector field to complex structure");
+       ok(!bt_ctf_field_type_structure_add_field(complex_structure_type,
+               string_type, "a_string"), "Add a_string field to complex structure");
+       ok(!bt_ctf_field_type_structure_add_field(complex_structure_type,
+               variant_type, "variant_value"),
+               "Add variant_value field to complex structure");
+       ok(!bt_ctf_field_type_structure_add_field(complex_structure_type,
+               inner_structure_type, "inner_structure"),
+               "Add inner_structure field to complex structure");
 
        ok(bt_ctf_event_class_create("clock") == NULL,
                "Reject creation of an event class with an illegal name");
@@ -1312,8 +1303,9 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class,
        bt_put(event);
 }
 
-static void field_copy_tests_validate_same_type(struct bt_ctf_field *field,
-       struct bt_ctf_field_type *expected_type, const char *name)
+static
+void field_copy_tests_validate_same_type(struct bt_ctf_field *field,
+               struct bt_ctf_field_type *expected_type, const char *name)
 {
        struct bt_ctf_field_type *copy_type;
 
@@ -1323,13 +1315,15 @@ static void field_copy_tests_validate_same_type(struct bt_ctf_field *field,
        bt_put(copy_type);
 }
 
-static void field_copy_tests_validate_diff_ptrs(struct bt_ctf_field *field_a,
-       struct bt_ctf_field *field_b, const char *name)
+static
+void field_copy_tests_validate_diff_ptrs(struct bt_ctf_field *field_a,
+               struct bt_ctf_field *field_b, const char *name)
 {
        ok(field_a != field_b,
                "bt_ctf_field_copy creates different pointers (%s)", name);
 }
 
+static
 void field_copy_tests()
 {
        struct bt_ctf_field_type *len_type = NULL;
@@ -1714,7 +1708,7 @@ void field_copy_tests()
                "bt_ctf_field_copy creates a valid enum's integer field copy");
 
        /* validate e copy */
-       str_val = bt_ctf_field_enumeration_get_mapping_name(e_copy);
+       str_val = bt_ctf_field_enumeration_get_single_mapping_name(e_copy);
        ok(str_val && !strcmp(str_val, "LABEL2"),
                "bt_ctf_field_copy creates a valid enum field copy");
 
@@ -1839,6 +1833,7 @@ void field_copy_tests()
        bt_put(strct_copy);
 }
 
+static
 void type_field_tests()
 {
        struct bt_ctf_field *uint_12;
@@ -1941,7 +1936,9 @@ void type_field_tests()
                "bt_ctf_field_type_integer_get_encoding returns a correct value");
 
        int_16_type = bt_ctf_field_type_integer_create(16);
-       bt_ctf_field_type_integer_set_signed(int_16_type, 1);
+       assert(int_16_type);
+       ok(!bt_ctf_field_type_integer_set_signed(int_16_type, 1),
+               "Set signedness of 16 bit integer to true");
        ok(bt_ctf_field_type_integer_get_signed(int_16_type) == 1,
                "bt_ctf_field_type_integer_get_signed returns a correct value for signed types");
        uint_8_type = bt_ctf_field_type_integer_create(8);
@@ -2121,6 +2118,7 @@ void type_field_tests()
        bt_put(returned_type);
 }
 
+static
 void packet_resize_test(struct bt_ctf_stream_class *stream_class,
                struct bt_ctf_stream *stream, struct bt_ctf_clock *clock)
 {
@@ -2262,6 +2260,7 @@ end:
        bt_put(ep_type);
 }
 
+static
 void test_empty_stream(struct bt_ctf_writer *writer)
 {
        int ret = 0;
@@ -2307,11 +2306,11 @@ end:
        bt_put(stream_class);
 }
 
-void test_custom_event_header_stream(struct bt_ctf_writer *writer)
+static
+void test_custom_event_header_stream(struct bt_ctf_writer *writer,
+                       struct bt_ctf_clock *clock)
 {
        int i, ret;
-       struct bt_ctf_trace *trace = NULL;
-       struct bt_ctf_clock *clock = NULL;
        struct bt_ctf_stream_class *stream_class = NULL;
        struct bt_ctf_stream *stream = NULL;
        struct bt_ctf_field_type *integer_type = NULL,
@@ -2321,18 +2320,6 @@ void test_custom_event_header_stream(struct bt_ctf_writer *writer)
        struct bt_ctf_event_class *event_class = NULL;
        struct bt_ctf_event *event = NULL;
 
-       trace = bt_ctf_writer_get_trace(writer);
-       if (!trace) {
-               fail("Failed to get trace from writer");
-               goto end;
-       }
-
-       clock = bt_ctf_trace_get_clock(trace, 0);
-       if (!clock) {
-               fail("Failed to get clock from trace");
-               goto end;
-       }
-
        stream_class = bt_ctf_stream_class_create("custom_event_header_stream");
        if (!stream_class) {
                fail("Failed to create stream class");
@@ -2497,8 +2484,6 @@ void test_custom_event_header_stream(struct bt_ctf_writer *writer)
                fail("Failed to flush custom_event_header stream");
        }
 end:
-       bt_put(clock);
-       bt_put(trace);
        bt_put(stream);
        bt_put(stream_class);
        bt_put(event_class);
@@ -2512,11 +2497,11 @@ end:
        bt_put(event_header_type);
 }
 
-void test_instanciate_event_before_stream(struct bt_ctf_writer *writer)
+static
+void test_instanciate_event_before_stream(struct bt_ctf_writer *writer,
+               struct bt_ctf_clock *clock)
 {
        int ret = 0;
-       struct bt_ctf_trace *trace = NULL;
-       struct bt_ctf_clock *clock = NULL;
        struct bt_ctf_stream_class *stream_class = NULL;
        struct bt_ctf_stream *stream = NULL,
                *ret_stream = NULL;
@@ -2525,20 +2510,6 @@ void test_instanciate_event_before_stream(struct bt_ctf_writer *writer)
        struct bt_ctf_field_type *integer_type = NULL;
        struct bt_ctf_field *integer = NULL;
 
-       trace = bt_ctf_writer_get_trace(writer);
-       if (!trace) {
-               diag("Failed to get trace from writer");
-               ret = -1;
-               goto end;
-       }
-
-       clock = bt_ctf_trace_get_clock(trace, 0);
-       if (!clock) {
-               diag("Failed to get clock from trace");
-               ret = -1;
-               goto end;
-       }
-
        stream_class = bt_ctf_stream_class_create("event_before_stream_test");
        if (!stream_class) {
                diag("Failed to create stream class");
@@ -2617,7 +2588,6 @@ void test_instanciate_event_before_stream(struct bt_ctf_writer *writer)
 end:
        ok(ret == 0,
                "Create an event before instanciating its associated stream");
-       bt_put(trace);
        bt_put(stream);
        bt_put(ret_stream);
        bt_put(stream_class);
@@ -2625,9 +2595,9 @@ end:
        bt_put(event);
        bt_put(integer_type);
        bt_put(integer);
-       bt_put(clock);
 }
 
+static
 void append_existing_event_class(struct bt_ctf_stream_class *stream_class)
 {
        struct bt_ctf_event_class *event_class;
@@ -2646,42 +2616,6 @@ void append_existing_event_class(struct bt_ctf_stream_class *stream_class)
        bt_put(event_class);
 }
 
-void test_trace_stream_class_clock(void)
-{
-       struct bt_ctf_trace *trace = NULL;
-       struct bt_ctf_stream_class *sc1 = NULL;
-       struct bt_ctf_stream_class *sc2 = NULL;
-       struct bt_ctf_clock *sc1_clock = NULL;
-       struct bt_ctf_clock *sc2_clock = NULL;
-       const char *clock_name = "hello";
-
-       trace = bt_ctf_trace_create();
-       assert(trace);
-       sc1 = bt_ctf_stream_class_create(NULL);
-       assert(sc1);
-       sc2 = bt_ctf_stream_class_create(NULL);
-       assert(sc2);
-       sc1_clock = bt_ctf_clock_create(clock_name);
-       assert(sc1_clock);
-       sc2_clock = bt_ctf_clock_create(clock_name);
-       assert(sc2_clock);
-
-       ok(!bt_ctf_stream_class_set_clock(sc1, sc1_clock),
-               "bt_ctf_stream_class_set_clock() succeeds for sc1");
-       ok(!bt_ctf_stream_class_set_clock(sc2, sc2_clock),
-               "bt_ctf_stream_class_set_clock() succeeds for sc2");
-       ok(!bt_ctf_trace_add_stream_class(trace, sc1),
-               "bt_ctf_trace_add_stream_class() succeeds with sc1");
-       ok(bt_ctf_trace_add_stream_class(trace, sc2),
-               "bt_ctf_trace_add_stream_class() fails with sc2 (different clock, same name)");
-
-       BT_PUT(trace);
-       BT_PUT(sc1);
-       BT_PUT(sc2);
-       BT_PUT(sc1_clock);
-       BT_PUT(sc2_clock);
-}
-
 static
 struct bt_ctf_event_class *create_minimal_event_class(void)
 {
@@ -2723,7 +2657,7 @@ void test_create_writer_vs_non_writer_mode(void)
        struct bt_ctf_field_type *empty_struct_ft = NULL;
        struct bt_ctf_field *int_field = NULL;
        struct bt_ctf_clock *writer_clock = NULL;
-       struct bt_ctf_clock *non_writer_clock = NULL;
+       struct bt_ctf_clock_class *non_writer_clock_class = NULL;
        struct bt_ctf_packet *packet = NULL;
        struct bt_ctf_packet *packet2 = NULL;
 
@@ -2753,7 +2687,7 @@ void test_create_writer_vs_non_writer_mode(void)
                "bt_ctf_stream_get_name() returns the stream's name");
        writer_clock = bt_ctf_clock_create("writer_clock");
        assert(writer_clock);
-       ret = bt_ctf_trace_add_clock(writer_trace, writer_clock);
+       ret = bt_ctf_writer_add_clock(writer, writer_clock);
        assert(!ret);
 
        /* Create non-writer trace, stream class, stream, and clock */
@@ -2768,9 +2702,11 @@ void test_create_writer_vs_non_writer_mode(void)
        assert(!ret);
        non_writer_stream = bt_ctf_stream_create(non_writer_sc, NULL);
        assert(non_writer_stream);
-       non_writer_clock = bt_ctf_clock_create("non_writer_clock");
-       assert(non_writer_clock);
-       ret = bt_ctf_trace_add_clock(non_writer_trace, non_writer_clock);
+       non_writer_clock_class =
+               bt_ctf_clock_class_create("non_writer_clock_class");
+       assert(non_writer_clock_class);
+       ret = bt_ctf_trace_add_clock_class(non_writer_trace,
+               non_writer_clock_class);
        assert(!ret);
 
        /* Create event class and event */
@@ -2798,24 +2734,6 @@ void test_create_writer_vs_non_writer_mode(void)
        ok(!bt_ctf_stream_append_event(writer_stream, event),
                "bt_ctf_stream_append_event() succeeds with a writer stream");
 
-       /*
-        * Verify that it's possible to get and set the value of a
-        * writer mode clock.
-        */
-       ok (!bt_ctf_clock_set_value(writer_clock, 1000),
-               "bt_ctf_clock_set_value() succeeds with a writer mode clock");
-       ok (bt_ctf_clock_get_value(writer_clock) == 1000,
-               "bt_ctf_clock_get_value() succeeds with a writer mode clock");
-
-       /*
-        * Verify that it's impossible to get and set the value of a
-        * non-writer mode clock.
-        */
-       ok (bt_ctf_clock_set_value(non_writer_clock, 1000),
-               "bt_ctf_clock_set_value() fails with a non-writer mode clock");
-       ok (bt_ctf_clock_get_value(non_writer_clock) == -1ULL,
-               "bt_ctf_clock_get_value() fails with a non-writer mode clock");
-
        /*
         * It should be possible to create a packet from a non-writer
         * stream, but not from a writer stream.
@@ -2901,12 +2819,13 @@ void test_create_writer_vs_non_writer_mode(void)
        bt_put(int_field);
        bt_put(empty_struct_ft);
        bt_put(writer_clock);
-       bt_put(non_writer_clock);
+       bt_put(non_writer_clock_class);
        bt_put(packet);
        bt_put(packet2);
-       delete_trace(trace_path);
+       recursive_rmdir(trace_path);
 }
 
+static
 void test_clock_utils(void)
 {
        int ret;
@@ -2920,17 +2839,40 @@ void test_clock_utils(void)
        assert(!ret);
        ret = bt_ctf_clock_set_frequency(clock, 1000000000);
        assert(!ret);
-       ok(bt_ctf_clock_ns_from_value(clock, 4321) == 1234000005321ULL,
-               "bt_ctf_clock_ns_from_value() returns the correct value with a 1 GHz frequency");
        ret = bt_ctf_clock_set_frequency(clock, 1534);
        assert(!ret);
-       ok(bt_ctf_clock_ns_from_value(clock, 4321) ==
-               (uint64_t) 1237468709256.845,
-               "bt_ctf_clock_ns_from_value() returns the correct value with a non-1 GHz frequency");
 
        BT_PUT(clock);
 }
 
+void test_set_clock_non_writer_stream_class(void)
+{
+       struct bt_ctf_clock *clock;
+       struct bt_ctf_trace *trace;
+       struct bt_ctf_stream_class *sc;
+       int ret;
+
+       clock = bt_ctf_clock_create("the_clock");
+       assert(clock);
+
+       trace = bt_ctf_trace_create();
+       assert(trace);
+
+       sc = bt_ctf_stream_class_create(NULL);
+       assert(sc);
+
+       ret = bt_ctf_stream_class_set_clock(sc, clock);
+       assert(ret == 0);
+
+       ret = bt_ctf_trace_add_stream_class(trace, sc);
+       ok(ret < 0,
+               "bt_ctf_trace_add_stream_class() fails with a stream class with a registered clock");
+
+       bt_put(clock);
+       bt_put(trace);
+       bt_put(sc);
+}
+
 int main(int argc, char **argv)
 {
        char trace_path[] = "/tmp/ctfwriter_XXXXXX";
@@ -2943,8 +2885,7 @@ int main(int argc, char **argv)
        const int64_t offset_s = 1351530929945824323;
        const int64_t offset = 1234567;
        int64_t get_offset_s,
-               get_offset,
-               get_time;
+               get_offset;
        const uint64_t precision = 10;
        const int is_absolute = 0xFF;
        char *metadata_string;
@@ -2952,6 +2893,7 @@ int main(int argc, char **argv)
        struct utsname name;
        char hostname[BABELTRACE_HOST_NAME_MAX];
        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;
        const char *ret_string;
@@ -3159,7 +3101,6 @@ int main(int argc, char **argv)
        /* Define a clock and add it to the trace */
        ok(bt_ctf_clock_create("signed") == NULL,
                "Illegal clock name rejected");
-       ok(bt_ctf_clock_create(NULL) == NULL, "NULL clock name rejected");
        clock = bt_ctf_clock_create(clock_name);
        ok(clock, "Clock created sucessfully");
        returned_clock_name = bt_ctf_clock_get_name(clock);
@@ -3221,22 +3162,8 @@ int main(int argc, char **argv)
        ok(bt_ctf_clock_get_is_absolute(clock) == !!is_absolute,
                "bt_ctf_clock_get_precision returns the correct is_absolute attribute once it is set");
 
-       ok(bt_ctf_clock_get_time(clock, &get_time) == 0,
-               "bt_ctf_clock_get_time succeeds");
-       ok(get_time == DEFAULT_CLOCK_TIME,
-               "bt_ctf_clock_get_time returns the correct default time");
-       ok(bt_ctf_clock_get_value(clock) == DEFAULT_CLOCK_VALUE,
-               "bt_ctf_clock_get_value returns the correct default value");
-       ok(bt_ctf_clock_set_value(clock, current_time) == 0,
-               "Set clock value");
-       ok(bt_ctf_clock_get_value(clock) == current_time,
-               "bt_ctf_clock_get_value returns the correct value once it is set");
        ok(bt_ctf_clock_set_time(clock, current_time) == 0,
                "Set clock time");
-       ok(bt_ctf_clock_get_time(clock, &get_time) == 0,
-               "bt_ctf_clock_get_time succeeds");
-       ok(get_time >= current_time - 1 && get_time <= current_time + 1,
-               "bt_ctf_clock_get_time returns the correct time once it is set");
 
        ok(!bt_ctf_clock_get_name(NULL),
                "bt_ctf_clock_get_name correctly handles NULL");
@@ -3256,10 +3183,6 @@ int main(int argc, char **argv)
                "bt_ctf_clock_get_offset correctly handles NULL output");
        ok(bt_ctf_clock_get_is_absolute(NULL) < 0,
                "bt_ctf_clock_get_is_absolute correctly handles NULL");
-       ok(bt_ctf_clock_get_time(NULL, &get_time) < 0,
-               "bt_ctf_clock_get_time correctly handles NULL clock");
-       ok(bt_ctf_clock_get_time(clock, NULL) < 0,
-               "bt_ctf_clock_get_time correctly handles NULL output");
 
        ok(bt_ctf_clock_set_description(NULL, NULL) < 0,
                "bt_ctf_clock_set_description correctly handles NULL clock");
@@ -3291,7 +3214,7 @@ int main(int argc, char **argv)
        ok(bt_ctf_clock_set_uuid(clock, NULL) < 0,
                "bt_ctf_clock_set_uuid correctly handles a NULL UUID");
        ok(bt_ctf_clock_set_uuid(clock, tmp_uuid) == 0,
-               "bt_ctf_clock_set_uuid sets a new uuid succesfully");
+               "bt_ctf_clock_set_uuid sets a new uuid successfully");
        ret_uuid = bt_ctf_clock_get_uuid(clock);
        ok(ret_uuid,
                "bt_ctf_clock_get_uuid returns a UUID after setting a new one");
@@ -3394,8 +3317,6 @@ int main(int argc, char **argv)
 
        ok(bt_ctf_trace_set_packet_header_type(NULL, packet_header_type) < 0,
                "bt_ctf_trace_set_packet_header_type handles a NULL trace correctly");
-       ok(bt_ctf_trace_set_packet_header_type(trace, NULL) < 0,
-               "bt_ctf_trace_set_packet_header_type handles a NULL packet_header_type correctly");
        ok(!bt_ctf_trace_set_packet_header_type(trace, packet_header_type),
                "Set a trace packet_header_type successfully");
 
@@ -3411,8 +3332,6 @@ int main(int argc, char **argv)
 
        ok(bt_ctf_stream_class_set_packet_context_type(NULL, packet_context_type),
                "bt_ctf_stream_class_set_packet_context_type handles a NULL stream class correctly");
-       ok(bt_ctf_stream_class_set_packet_context_type(stream_class, NULL),
-               "bt_ctf_stream_class_set_packet_context_type handles a NULL packet context type correctly");
 
        integer_type = bt_ctf_field_type_integer_create(32);
        ok(bt_ctf_stream_class_set_packet_context_type(stream_class,
@@ -3438,9 +3357,6 @@ int main(int argc, char **argv)
        ok(bt_ctf_stream_class_set_event_context_type(NULL,
                stream_event_context_type) < 0,
                "bt_ctf_stream_class_set_event_context_type handles a NULL stream_class correctly");
-       ok(bt_ctf_stream_class_set_event_context_type(stream_class,
-               NULL) < 0,
-               "bt_ctf_stream_class_set_event_context_type handles a NULL event_context correctly");
        ok(bt_ctf_stream_class_set_event_context_type(stream_class,
                integer_type) < 0,
                "bt_ctf_stream_class_set_event_context_type validates that the event context os a structure");
@@ -3455,6 +3371,8 @@ int main(int argc, char **argv)
        bt_put(ret_field_type);
 
        /* Instantiate a stream and append events */
+       ret = bt_ctf_writer_add_clock(writer, clock);
+       assert(ret == 0);
        stream1 = bt_ctf_writer_create_stream(writer, stream_class);
        ok(stream1, "Instanciate a stream class from writer");
 
@@ -3463,31 +3381,33 @@ 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_count(NULL) < 0,
-               "bt_ctf_trace_get_clock_count correctly handles NULL");
-       ok(bt_ctf_trace_get_clock_count(trace) == 1,
-               "bt_ctf_trace_get_clock_count returns the correct number of clocks");
-       ok(!bt_ctf_trace_get_clock(NULL, 0),
-               "bt_ctf_trace_get_clock correctly handles NULL");
-       ok(!bt_ctf_trace_get_clock(trace, -1),
-               "bt_ctf_trace_get_clock correctly handles negative indexes");
-       ok(!bt_ctf_trace_get_clock(trace, 1),
-               "bt_ctf_trace_get_clock correctly handles out of bound accesses");
-       ret_clock = bt_ctf_trace_get_clock(trace, 0);
-       ok(ret_clock == clock,
-               "bt_ctf_trace_get_clock returns the right clock instance");
-       bt_put(ret_clock);
-       ok(!bt_ctf_trace_get_clock_by_name(trace, NULL),
-               "bt_ctf_trace_get_clock_by_name correctly handles NULL (trace)");
-       ok(!bt_ctf_trace_get_clock_by_name(NULL, clock_name),
+       ok(bt_ctf_trace_get_clock_class_count(NULL) < 0,
+               "bt_ctf_trace_get_clock_class_count correctly handles NULL");
+       ok(bt_ctf_trace_get_clock_class_count(trace) == 1,
+               "bt_ctf_trace_get_clock_class_count returns the correct number of clocks");
+       ok(!bt_ctf_trace_get_clock_class(NULL, 0),
+               "bt_ctf_trace_get_clock_class correctly handles NULL");
+       ok(!bt_ctf_trace_get_clock_class(trace, -1),
+               "bt_ctf_trace_get_clock_class correctly handles negative indexes");
+       ok(!bt_ctf_trace_get_clock_class(trace, 1),
+               "bt_ctf_trace_get_clock_class correctly handles out of bound accesses");
+       ret_clock_class = bt_ctf_trace_get_clock_class(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);
+       ok(!bt_ctf_trace_get_clock_class_by_name(trace, NULL),
+               "bt_ctf_trace_get_clock_class_by_name correctly handles NULL (trace)");
+       ok(!bt_ctf_trace_get_clock_class_by_name(NULL, clock_name),
                "bt_ctf_trace_get_clock_by_name correctly handles NULL (clock name)");
-       ok(!bt_ctf_trace_get_clock_by_name(NULL, NULL),
+       ok(!bt_ctf_trace_get_clock_class_by_name(NULL, NULL),
                "bt_ctf_trace_get_clock_by_name correctly handles NULL (both)");
-       ret_clock = bt_ctf_trace_get_clock_by_name(trace, clock_name);
-       ok(ret_clock == clock,
-               "bt_ctf_trace_get_clock_by_name returns the right clock instance");
-       bt_put(ret_clock);
-       ok(!bt_ctf_trace_get_clock_by_name(trace, "random"),
+       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");
 
        ok(bt_ctf_stream_get_class(NULL) == NULL,
@@ -3579,11 +3499,11 @@ int main(int argc, char **argv)
 
        test_clock_utils();
 
-       test_trace_stream_class_clock();
-
        test_create_writer_vs_non_writer_mode();
 
-       test_instanciate_event_before_stream(writer);
+       test_set_clock_non_writer_stream_class();
+
+       test_instanciate_event_before_stream(writer, clock);
 
        append_simple_event(stream_class, stream1, clock);
 
@@ -3595,7 +3515,7 @@ int main(int argc, char **argv)
 
        test_empty_stream(writer);
 
-       test_custom_event_header_stream(writer);
+       test_custom_event_header_stream(writer, clock);
 
        metadata_string = bt_ctf_writer_get_metadata_string(writer);
        ok(metadata_string, "Get metadata string");
@@ -3621,6 +3541,6 @@ int main(int argc, char **argv)
        free(metadata_string);
        bt_put(stream_class);
 
-       delete_trace(trace_path);
+       recursive_rmdir(trace_path);
        return 0;
 }
This page took 0.036931 seconds and 4 git commands to generate.