Tests: unchecked return value in test_ctf_writer
[babeltrace.git] / tests / lib / test_ctf_writer.c
index ab1d552ae89f17c4cd6999204005836a46db2862..09eb05f87ba3e2f63cc0142a246140f9df229bd8 100644 (file)
@@ -44,7 +44,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 618
 
 static int64_t current_time = 42;
 
 /* 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;
@@ -84,6 +85,7 @@ end:
        return ret;
 }
 
+static
 void validate_metadata(char *parser_path, char *metadata_path)
 {
        int ret = 0;
@@ -200,6 +202,7 @@ close_fp:
        }
 }
 
+static
 void validate_trace(char *parser_path, char *trace_path)
 {
        int ret = 0;
@@ -282,6 +285,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)
 {
@@ -489,7 +493,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
@@ -698,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)
 {
@@ -762,10 +768,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,
@@ -784,12 +793,12 @@ 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,
+               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);
@@ -819,10 +828,10 @@ void append_complex_event(struct bt_ctf_stream_class *stream_class,
                "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");
@@ -870,14 +879,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");
@@ -1278,8 +1290,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;
 
@@ -1289,13 +1302,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;
@@ -1805,6 +1820,7 @@ void field_copy_tests()
        bt_put(strct_copy);
 }
 
+static
 void type_field_tests()
 {
        struct bt_ctf_field *uint_12;
@@ -1907,6 +1923,7 @@ 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);
+       assert(int_16_type);
        bt_ctf_field_type_integer_set_signed(int_16_type, 1);
        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");
@@ -2087,6 +2104,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)
 {
@@ -2228,6 +2246,7 @@ end:
        bt_put(ep_type);
 }
 
+static
 void test_empty_stream(struct bt_ctf_writer *writer)
 {
        int ret = 0;
@@ -2273,6 +2292,7 @@ end:
        bt_put(stream_class);
 }
 
+static
 void test_custom_event_header_stream(struct bt_ctf_writer *writer)
 {
        int i, ret;
@@ -2478,6 +2498,7 @@ end:
        bt_put(event_header_type);
 }
 
+static
 void test_instanciate_event_before_stream(struct bt_ctf_writer *writer)
 {
        int ret = 0;
@@ -2594,6 +2615,7 @@ end:
        bt_put(clock);
 }
 
+static
 void append_existing_event_class(struct bt_ctf_stream_class *stream_class)
 {
        struct bt_ctf_event_class *event_class;
@@ -2612,6 +2634,7 @@ void append_existing_event_class(struct bt_ctf_stream_class *stream_class)
        bt_put(event_class);
 }
 
+static
 void test_trace_stream_class_clock(void)
 {
        struct bt_ctf_trace *trace = NULL;
@@ -2870,8 +2893,10 @@ void test_create_writer_vs_non_writer_mode(void)
        bt_put(non_writer_clock);
        bt_put(packet);
        bt_put(packet2);
+       recursive_rmdir(trace_path);
 }
 
+static
 void test_clock_utils(void)
 {
        int ret;
@@ -2880,7 +2905,7 @@ void test_clock_utils(void)
        clock = bt_ctf_clock_create("water");
        assert(clock);
        ret = bt_ctf_clock_set_offset_s(clock, 1234);
-       assert(clock);
+       assert(!ret);
        ret = bt_ctf_clock_set_offset(clock, 1000);
        assert(!ret);
        ret = bt_ctf_clock_set_frequency(clock, 1000000000);
@@ -3256,7 +3281,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");
@@ -3586,33 +3611,6 @@ int main(int argc, char **argv)
        free(metadata_string);
        bt_put(stream_class);
 
-       /* Remove all trace files and delete temporary trace directory */
-       DIR *trace_dir = opendir(trace_path);
-       if (!trace_dir) {
-               perror("# opendir");
-               return -1;
-       }
-
-       struct dirent *entry;
-       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(entry->d_name, &st)) {
-                       continue;
-               }
-
-               if (S_ISREG(st.st_mode)) {
-                       unlinkat(bt_dirfd(trace_dir), entry->d_name, 0);
-               }
-       }
-
-       rmdir(trace_path);
-       closedir(trace_dir);
+       recursive_rmdir(trace_path);
        return 0;
 }
This page took 0.028259 seconds and 4 git commands to generate.