lib: make packets and packet messages optional, disabled by default

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

diff --git a/tests/lib/test_trace_ir_ref.c b/tests/lib/test_trace_ir_ref.c
index f0f3961dcb6ec56d72d3a7844e5a85c28422f9ca..90cff9cddbeae57737a6bfcd2374e28b0d951638 100644 (file)
--- a/tests/lib/test_trace_ir_ref.c
+++ b/tests/lib/test_trace_ir_ref.c
@@ -19,11 +19,21 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <stdio.h>
 #include "tap/tap.h"
-#include <babeltrace/babeltrace.h>
-#include <babeltrace/object-internal.h>
-#include <babeltrace/compat/stdlib-internal.h>
-#include <babeltrace/assert-internal.h>
+#include <babeltrace2/babeltrace.h>
+#include "lib/object.h"
+#include "compat/stdlib.h"
+#include "common/assert.h"
+#include <babeltrace2/ctf-writer/writer.h>
+#include <babeltrace2/ctf-writer/clock.h>
+#include <babeltrace2/ctf-writer/clock-class.h>
+#include <babeltrace2/ctf-writer/stream.h>
+#include <babeltrace2/ctf-writer/event.h>
+#include <babeltrace2/ctf-writer/event-types.h>
+#include <babeltrace2/ctf-writer/event-fields.h>
+#include <babeltrace2/ctf-writer/stream-class.h>
+#include <babeltrace2/ctf-writer/trace.h>
 #include "common.h"
 
 #define NR_TESTS 37
@@ -187,37 +197,6 @@ static bt_event_class *create_complex_event(bt_stream_class *sc,
        return event;
 }
 
-static void set_stream_class_field_classes(
-               bt_stream_class *stream_class)
-{
-       bt_trace_class *trace_class =
-               bt_stream_class_borrow_trace_class(stream_class);
-       bt_field_class *packet_context_type;
-       bt_field_class *fc;
-       int ret;
-
-       packet_context_type = bt_field_class_structure_create(trace_class);
-       BT_ASSERT(packet_context_type);
-       fc = bt_field_class_unsigned_integer_create(trace_class);
-       BT_ASSERT(fc);
-       bt_field_class_integer_set_field_value_range(fc, 32);
-       ret = bt_field_class_structure_append_member(packet_context_type,
-               "packet_size", fc);
-       BT_ASSERT(ret == 0);
-       bt_field_class_put_ref(fc);
-       fc = bt_field_class_unsigned_integer_create(trace_class);
-       BT_ASSERT(fc);
-       bt_field_class_integer_set_field_value_range(fc, 32);
-       ret = bt_field_class_structure_append_member(packet_context_type,
-               "content_size", fc);
-       BT_ASSERT(ret == 0);
-       bt_field_class_put_ref(fc);
-       ret = bt_stream_class_set_packet_context_field_class(
-               stream_class, packet_context_type);
-       BT_ASSERT(ret == 0);
-       bt_field_class_put_ref(packet_context_type);
-}
-
 static void create_sc1(bt_trace_class *trace_class)
 {
        int ret;
@@ -228,7 +207,6 @@ static void create_sc1(bt_trace_class *trace_class)
        BT_ASSERT(sc1);
        ret = bt_stream_class_set_name(sc1, "sc1");
        BT_ASSERT(ret == 0);
-       set_stream_class_field_classes(sc1);
        ec1 = create_complex_event(sc1, "ec1");
        BT_ASSERT(ec1);
        ec2 = create_simple_event(sc1, "ec2");
@@ -252,7 +230,6 @@ static void create_sc2(bt_trace_class *trace_class)
        BT_ASSERT(sc2);
        ret = bt_stream_class_set_name(sc2, "sc2");
        BT_ASSERT(ret == 0);
-       set_stream_class_field_classes(sc2);
        ec3 = create_simple_event(sc2, "ec3");
        ret_stream = bt_event_class_borrow_stream_class(ec3);
        ok(ret_stream == sc2, "Borrow parent stream SC2 from EC3");
@@ -432,21 +409,21 @@ static void test_example_scenario(bt_self_component_source *self_comp)
 }
 
 static
-bt_self_component_status src_init(
+bt_component_class_init_method_status src_init(
        bt_self_component_source *self_comp,
        const bt_value *params, void *init_method_data)
 {
        test_example_scenario(self_comp);
-       return BT_SELF_COMPONENT_STATUS_OK;
+       return BT_COMPONENT_CLASS_INIT_METHOD_STATUS_OK;
 }
 
 static
-bt_self_message_iterator_status src_iter_next(
+bt_component_class_message_iterator_next_method_status src_iter_next(
                bt_self_message_iterator *self_iterator,
                bt_message_array_const msgs, uint64_t capacity,
                uint64_t *count)
 {
-       return BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
+       return BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR;
 }
 
 static void test_example_scenario_in_graph(void)
@@ -461,7 +438,7 @@ static void test_example_scenario_in_graph(void)
        BT_ASSERT(ret == 0);
        graph = bt_graph_create();
        ret = bt_graph_add_source_component(graph, comp_cls, "src-comp",
-               NULL, NULL);
+               NULL, BT_LOGGING_LEVEL_NONE, NULL);
        BT_ASSERT(ret == 0);
        bt_graph_put_ref(graph);
        bt_component_class_source_put_ref(comp_cls);