CTF IR -> Trace IR

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

diff --git a/tests/lib/test_ir_visit.c b/tests/lib/test_ir_visit.c
index 7c1c8c261705bf49e3aacd79391dfa87fc07eec7..fa2046bbee4bd6814abba04328f4f8f57267bb11 100644 (file)
--- a/tests/lib/test_ir_visit.c
+++ b/tests/lib/test_ir_visit.c
@@ -1,7 +1,7 @@
 /*
  * test_ir_visit.c
  *
- * CTF IR visitor interface test
+ * Trace IR visitor interface test
  *
  * Copyright 2016 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
@@ -21,15 +21,15 @@
 
 #include "tap/tap.h"
 #include <babeltrace/ref.h>
-#include <babeltrace/ctf-ir/event-class.h>
-#include <babeltrace/ctf-ir/field-types.h>
-#include <babeltrace/ctf-ir/stream-class.h>
-#include <babeltrace/ctf-ir/trace.h>
-#include <babeltrace/ctf-ir/visitor.h>
+#include <babeltrace/trace-ir/event-class.h>
+#include <babeltrace/trace-ir/field-types.h>
+#include <babeltrace/trace-ir/stream-class.h>
+#include <babeltrace/trace-ir/trace.h>
+#include <babeltrace/trace-ir/visitor.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
-#include <assert.h>
+#include <babeltrace/assert-internal.h>
 
 #define NR_TESTS 13
 
@@ -73,6 +73,7 @@ struct bt_event_class *init_event_class(const char *name)
 {
        int ret;
        struct bt_event_class *ec = bt_event_class_create(name);
+       struct bt_field_type *payload_ft = NULL;;
        struct bt_field_type *int_field =
                        bt_field_type_integer_create(8);
 
@@ -80,16 +81,20 @@ struct bt_event_class *init_event_class(const char *name)
                goto error;
        }
 
-       ret = bt_event_class_add_field(ec, int_field, "an_int_field");
+       payload_ft = bt_event_class_get_payload_field_type(ec);
+       ret = bt_field_type_structure_add_field(payload_ft,
+               int_field, "an_int_field");
        if (ret) {
                goto error;
        }
 
        BT_PUT(int_field);
+       BT_PUT(payload_ft);
        return ec;
 error:
        BT_PUT(ec);
        BT_PUT(int_field);
+       BT_PUT(payload_ft);
        return NULL;
 }
 
@@ -102,35 +107,35 @@ static void set_stream_class_field_types(
        int ret;
 
        packet_context_type = bt_field_type_structure_create();
-       assert(packet_context_type);
+       BT_ASSERT(packet_context_type);
        ft = bt_field_type_integer_create(32);
-       assert(ft);
+       BT_ASSERT(ft);
        ret = bt_field_type_structure_add_field(packet_context_type,
                ft, "packet_size");
-       assert(ret == 0);
+       BT_ASSERT(ret == 0);
        bt_put(ft);
        ft = bt_field_type_integer_create(32);
-       assert(ft);
+       BT_ASSERT(ft);
        ret = bt_field_type_structure_add_field(packet_context_type,
                ft, "content_size");
-       assert(ret == 0);
+       BT_ASSERT(ret == 0);
        bt_put(ft);
 
        event_header_type = bt_field_type_structure_create();
-       assert(event_header_type);
+       BT_ASSERT(event_header_type);
        ft = bt_field_type_integer_create(32);
-       assert(ft);
+       BT_ASSERT(ft);
        ret = bt_field_type_structure_add_field(event_header_type,
                ft, "id");
-       assert(ret == 0);
+       BT_ASSERT(ret == 0);
        bt_put(ft);
 
-       ret = bt_stream_class_set_packet_context_type(stream_class,
+       ret = bt_stream_class_set_packet_context_field_type(stream_class,
                packet_context_type);
-       assert(ret == 0);
-       ret = bt_stream_class_set_event_header_type(stream_class,
+       BT_ASSERT(ret == 0);
+       ret = bt_stream_class_set_event_header_field_type(stream_class,
                event_header_type);
-       assert(ret == 0);
+       BT_ASSERT(ret == 0);
 
        bt_put(packet_context_type);
        bt_put(event_header_type);
@@ -143,17 +148,17 @@ static void set_trace_packet_header(struct bt_trace *trace)
        int ret;
 
        packet_header_type = bt_field_type_structure_create();
-       assert(packet_header_type);
+       BT_ASSERT(packet_header_type);
        ft = bt_field_type_integer_create(32);
-       assert(ft);
+       BT_ASSERT(ft);
        ret = bt_field_type_structure_add_field(packet_header_type,
                ft, "stream_id");
-       assert(ret == 0);
+       BT_ASSERT(ret == 0);
        bt_put(ft);
 
-       ret = bt_trace_set_packet_header_type(trace,
+       ret = bt_trace_set_packet_header_field_type(trace,
                packet_header_type);
-       assert(ret == 0);
+       BT_ASSERT(ret == 0);
 
        bt_put(packet_header_type);
 }