Tests: add environment field can be added after stream creation

[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 2aa0c7e0de02ae113a3526f06065422534cb40e4..756d168055246b276221d9b25b52f0b20d764678 100644 (file)
--- a/tests/lib/test_ctf_writer.c
+++ b/tests/lib/test_ctf_writer.c
@@ -566,7 +566,7 @@ void append_simple_event(struct bt_ctf_stream_class *stream_class,
        bt_ctf_event_set_payload(simple_event, "enum_field_unsigned",
                enum_field_unsigned);
        ret_char = bt_ctf_field_enumeration_get_mapping_name(enum_field_unsigned);
-       ok(!strcmp(ret_char, mapping_name_test),
+       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");
 
        ok(bt_ctf_clock_set_time(clock, current_time) == 0, "Set clock time");
@@ -875,7 +875,8 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class,
                "bt_ctf_event_class_set_attribute cannot set \"name\" or \"model.emf.uri\" to an integer value");
        BT_OBJECT_PUT(obj);
 
-       assert(obj = bt_object_integer_create_init(5));
+       obj = bt_object_integer_create_init(5);
+       assert(obj);
        ok(!bt_ctf_event_class_set_attribute(event_class, "loglevel", obj),
                "bt_ctf_event_class_set_attribute succeeds in setting the \"loglevel\" attribute");
        BT_OBJECT_PUT(obj);
@@ -903,7 +904,8 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class,
        ok(ret,
                "bt_ctf_event_class_set_attribute cannot set \"id\" or \"loglevel\" to a string value");
        BT_OBJECT_PUT(obj);
-       assert(obj = bt_object_string_create_init("http://kernel.org/"));
+       obj = bt_object_string_create_init("http://kernel.org/");
+       assert(obj);
        assert(!bt_ctf_event_class_set_attribute(event_class, "model.emf.uri", obj));
        BT_OBJECT_PUT(obj);
 
@@ -1782,7 +1784,8 @@ void append_existing_event_class(struct bt_ctf_stream_class *stream_class)
                "two event classes with the same name cannot cohabit within the same stream class");
        bt_ctf_event_class_put(event_class);
 
-       assert(event_class = bt_ctf_event_class_create("different name, ok"));
+       event_class = bt_ctf_event_class_create("different name, ok");
+       assert(event_class);
        assert(!bt_ctf_event_class_set_id(event_class, 11));
        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");
@@ -2384,6 +2387,9 @@ int main(int argc, char **argv)
        ok(!bt_ctf_stream_set_packet_header(stream1, packet_header),
                "Successfully set a stream's packet header");
 
+       ok(bt_ctf_writer_add_environment_field(writer, "new_field", "test") == 0,
+               "Add environment field to writer after stream creation");
+
        test_instanciate_event_before_stream(writer);
 
        append_simple_event(stream_class, stream1, clock);