From: Simon Marchi <simon.marchi@efficios.com>
Date: Tue, 13 Feb 2024 03:46:02 +0000 (-0500)
Subject: tests/lib: C++ify `conds/conds-triggers.cpp`
X-Git-Url: https://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=7809b6ddddf7de28a6f08ea8cce507d1501f2b0b

tests/lib: C++ify `conds/conds-triggers.cpp`

 - use an anonymous namespace for local stuff
 - use bt2 C++ bindings
 - rename functions to camel case
 - mark functions as `noexcept`

Change-Id: Id31e3703eb48662cc3090d57247fb16bcea0d7f8
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/11797
Tested-by: jenkins <jenkins@lttng.org>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
---

diff --git a/tests/lib/conds/conds-triggers.cpp b/tests/lib/conds/conds-triggers.cpp
index 55299737..79aa5e6c 100644
--- a/tests/lib/conds/conds-triggers.cpp
+++ b/tests/lib/conds/conds-triggers.cpp
@@ -6,52 +6,48 @@
 
 #include <babeltrace2/babeltrace.h>
 
-#include "common/assert.h"
-
 #include "utils.hpp"
 
-static void trigger_graph_mip_version(void)
+namespace {
+
+void triggerGraphMipVersion() noexcept
 {
     bt_graph_create(292);
 }
 
-static bt_field_class *get_uint_fc(bt_self_component *self_comp)
+bt2::IntegerFieldClass::Shared getUIntFc(const bt2::SelfComponent self) noexcept
 {
-    bt_trace_class *tc = bt_trace_class_create(self_comp);
-    bt_field_class *fc;
-
-    BT_ASSERT(tc);
-    fc = bt_field_class_integer_unsigned_create(tc);
-    BT_ASSERT(fc);
-    return fc;
+    return self.createTraceClass()->createUnsignedIntegerFieldClass();
 }
 
-static void trigger_fc_int_set_field_value_range_n_0(const bt2::SelfComponent self)
+void triggerFcIntSetFieldValueRangeN0(const bt2::SelfComponent self) noexcept
 {
-    bt_field_class_integer_set_field_value_range(get_uint_fc(self.libObjPtr()), 0);
+    getUIntFc(self)->fieldValueRange(0);
 }
 
-static void trigger_fc_int_set_field_value_range_n_gt_64(const bt2::SelfComponent self)
+void triggerFcIntSetFieldValueRangeNGt64(const bt2::SelfComponent self) noexcept
 {
-    bt_field_class_integer_set_field_value_range(get_uint_fc(self.libObjPtr()), 65);
+    getUIntFc(self)->fieldValueRange(65);
 }
 
-static void trigger_fc_int_set_field_value_range_null(bt2::SelfComponent)
+void triggerFcIntSetFieldValueRangeNull(bt2::SelfComponent) noexcept
 {
     bt_field_class_integer_set_field_value_range(NULL, 23);
 }
 
-static const struct cond_trigger triggers[] = {
-    COND_TRIGGER_PRE_BASIC("pre:graph-create:valid-mip-version", NULL, trigger_graph_mip_version),
+const cond_trigger triggers[] = {
+    COND_TRIGGER_PRE_BASIC("pre:graph-create:valid-mip-version", NULL, triggerGraphMipVersion),
     COND_TRIGGER_PRE_RUN_IN_COMP_CLS_INIT("pre:field-class-integer-set-field-value-range:valid-n",
-                                          "0", trigger_fc_int_set_field_value_range_n_0),
+                                          "0", triggerFcIntSetFieldValueRangeN0),
     COND_TRIGGER_PRE_RUN_IN_COMP_CLS_INIT("pre:field-class-integer-set-field-value-range:valid-n",
-                                          "gt-64", trigger_fc_int_set_field_value_range_n_gt_64),
+                                          "gt-64", triggerFcIntSetFieldValueRangeNGt64),
     COND_TRIGGER_PRE_RUN_IN_COMP_CLS_INIT(
         "pre:field-class-integer-set-field-value-range:not-null:field-class", NULL,
-        trigger_fc_int_set_field_value_range_null),
+        triggerFcIntSetFieldValueRangeNull),
 };
 
+} /* namespace */
+
 int main(int argc, const char *argv[])
 {
     cond_main(argc, argv, triggers, sizeof(triggers) / sizeof(*triggers));