lib: make trace IR API const-correct

[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 39dcd80a8f76bc5f28cdcc62613f0f4cafae60c9..44fd5246c9a9539905e46388804cf2cca55ac281 100644 (file)
--- a/tests/lib/test_trace_ir_ref.c
+++ b/tests/lib/test_trace_ir_ref.c
@@ -20,20 +20,7 @@
  */
 
 #include "tap/tap.h"
-#include <babeltrace/ctf-writer/clock.h>
-#include <babeltrace/ctf-writer/event.h>
-#include <babeltrace/ctf-writer/fields.h>
-#include <babeltrace/ctf-writer/stream-class.h>
-#include <babeltrace/ctf-writer/stream.h>
-#include <babeltrace/ctf-writer/trace.h>
-#include <babeltrace/ctf-writer/writer.h>
-#include <babeltrace/trace-ir/clock-class.h>
-#include <babeltrace/trace-ir/event.h>
-#include <babeltrace/trace-ir/event-class.h>
-#include <babeltrace/trace-ir/fields.h>
-#include <babeltrace/trace-ir/stream-class.h>
-#include <babeltrace/trace-ir/stream.h>
-#include <babeltrace/trace-ir/trace.h>
+#include <babeltrace/babeltrace.h>
 #include <babeltrace/object-internal.h>
 #include <babeltrace/compat/stdlib-internal.h>
 #include <babeltrace/assert-internal.h>
@@ -86,22 +73,19 @@ static struct bt_field_class *create_integer_struct(void)
        BT_ASSERT(structure);
        ui8 = bt_field_class_unsigned_integer_create();
        BT_ASSERT(ui8);
-       ret = bt_field_class_integer_set_field_value_range(ui8, 8);
-       BT_ASSERT(ret == 0);
+       bt_field_class_integer_set_field_value_range(ui8, 8);
        ret = bt_field_class_structure_append_member(structure,
                "payload_8", ui8);
        BT_ASSERT(ret == 0);
        ui16 = bt_field_class_unsigned_integer_create();
        BT_ASSERT(ui16);
-       ret = bt_field_class_integer_set_field_value_range(ui16, 16);
-       BT_ASSERT(ret == 0);
+       bt_field_class_integer_set_field_value_range(ui16, 16);
        ret = bt_field_class_structure_append_member(structure,
                "payload_16", ui16);
        BT_ASSERT(ret == 0);
        ui32 = bt_field_class_unsigned_integer_create();
        BT_ASSERT(ui32);
-       ret = bt_field_class_integer_set_field_value_range(ui32, 32);
-       BT_ASSERT(ret == 0);
+       bt_field_class_integer_set_field_value_range(ui32, 32);
        ret = bt_field_class_structure_append_member(structure,
                "payload_32", ui32);
        BT_ASSERT(ret == 0);
@@ -146,8 +130,8 @@ static struct bt_ctf_field_type *create_writer_integer_struct(void)
  *     - uint16_t payload_16;
  *     - uint32_t payload_32;
  */
-static struct bt_event_class *create_simple_event(struct bt_stream_class *sc,
-               const char *name)
+static struct bt_event_class *create_simple_event(
+               struct bt_stream_class *sc, const char *name)
 {
        int ret;
        struct bt_event_class *event = NULL;
@@ -176,7 +160,8 @@ static struct bt_event_class *create_simple_event(struct bt_stream_class *sc,
  *           - uint16_t payload_16;
  *           - uint32_t payload_32;
  */
-static struct bt_event_class *create_complex_event(struct bt_stream_class *sc,
+static struct bt_event_class *create_complex_event(
+               struct bt_stream_class *sc,
                const char *name)
 {
        int ret;
@@ -214,16 +199,14 @@ static void set_stream_class_field_classes(
        BT_ASSERT(packet_context_type);
        fc = bt_field_class_unsigned_integer_create();
        BT_ASSERT(fc);
-       ret = bt_field_class_integer_set_field_value_range(fc, 32);
-       BT_ASSERT(ret == 0);
+       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_object_put_ref(fc);
        fc = bt_field_class_unsigned_integer_create();
        BT_ASSERT(fc);
-       ret = bt_field_class_integer_set_field_value_range(fc, 32);
-       BT_ASSERT(ret == 0);
+       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);
@@ -232,17 +215,16 @@ static void set_stream_class_field_classes(
        BT_ASSERT(event_header_type);
        fc = bt_field_class_unsigned_integer_create();
        BT_ASSERT(fc);
-       ret = bt_field_class_integer_set_field_value_range(fc, 32);
-       BT_ASSERT(ret == 0);
+       bt_field_class_integer_set_field_value_range(fc, 32);
        ret = bt_field_class_structure_append_member(event_header_type,
                "id", fc);
        BT_ASSERT(ret == 0);
        bt_object_put_ref(fc);
-       ret = bt_stream_class_set_packet_context_field_class(stream_class,
-               packet_context_type);
+       ret = bt_stream_class_set_packet_context_field_class(
+               stream_class, packet_context_type);
        BT_ASSERT(ret == 0);
-       ret = bt_stream_class_set_event_header_field_class(stream_class,
-               event_header_type);
+       ret = bt_stream_class_set_event_header_field_class(
+               stream_class, event_header_type);
        BT_ASSERT(ret == 0);
        bt_object_put_ref(packet_context_type);
        bt_object_put_ref(event_header_type);
@@ -300,8 +282,7 @@ static void set_trace_packet_header(struct bt_trace *trace)
        BT_ASSERT(packet_header_type);
        fc = bt_field_class_unsigned_integer_create();
        BT_ASSERT(fc);
-       ret = bt_field_class_integer_set_field_value_range(fc, 32);
-       BT_ASSERT(ret == 0);
+       bt_field_class_integer_set_field_value_range(fc, 32);
        ret = bt_field_class_structure_append_member(packet_header_type,
                "stream_id", fc);
        BT_ASSERT(ret == 0);
@@ -379,7 +360,9 @@ static void test_example_scenario(void)
                        "TC1 reference count is 1");
 
        /* User A acquires a reference to SC2 from TC1. */
-       user_a.sc = bt_object_get_ref(bt_trace_borrow_stream_class_by_index(user_a.tc, 1));
+       user_a.sc = bt_trace_borrow_stream_class_by_index(
+                       user_a.tc, 1);
+       bt_object_get_ref(user_a.sc);
        ok(user_a.sc, "User A acquires SC2 from TC1");
        ok(bt_object_get_ref_count((void *) weak_tc1) == 2,
                        "TC1 reference count is 2");
@@ -387,8 +370,9 @@ static void test_example_scenario(void)
                        "SC2 reference count is 1");
 
        /* User A acquires a reference to EC3 from SC2. */
-       user_a.ec = bt_object_get_ref(
-               bt_stream_class_borrow_event_class_by_index(user_a.sc, 0));
+       user_a.ec = bt_stream_class_borrow_event_class_by_index(
+                       user_a.sc, 0);
+       bt_object_get_ref(user_a.ec);
        ok(user_a.ec, "User A acquires EC3 from SC2");
        ok(bt_object_get_ref_count((void *) weak_tc1) == 2,
                        "TC1 reference count is 2");
@@ -427,7 +411,8 @@ static void test_example_scenario(void)
 
        /* User B acquires a reference to SC1. */
        diag("User B acquires a reference to SC1");
-       user_b.sc = bt_object_get_ref(weak_sc1);
+       user_b.sc = weak_sc1;
+       bt_object_get_ref(user_b.sc);
        ok(bt_object_get_ref_count((void *) weak_tc1) == 2,
                        "TC1 reference count is 2");
        ok(bt_object_get_ref_count((void *) weak_sc1) == 1,
@@ -435,8 +420,9 @@ static void test_example_scenario(void)
 
        /* User C acquires a reference to EC1. */
        diag("User C acquires a reference to EC1");
-       user_c.ec = bt_object_get_ref(
-               bt_stream_class_borrow_event_class_by_index(user_b.sc, 0));
+       user_c.ec = bt_stream_class_borrow_event_class_by_index(
+                       user_b.sc, 0);
+       bt_object_get_ref(user_c.ec);
        ok(bt_object_get_ref_count((void *) weak_ec1) == 1,
                        "EC1 reference count is 1");
        ok(bt_object_get_ref_count((void *) weak_sc1) == 2,