tests/lib: C++ify run-in and condition trigger code

[babeltrace.git] / tests / lib / test-fields-bin.cpp

diff --git a/tests/lib/test-fields-bin.cpp b/tests/lib/test-fields-bin.cpp
index 79f50f31a8eadba4fda5558e25e2836cbb15df3b..3d2d9adef0246729ea3ea2f6db44c839f0016731 100644 (file)
--- a/tests/lib/test-fields-bin.cpp
+++ b/tests/lib/test-fields-bin.cpp
@@ -14,9 +14,11 @@ namespace {
 
 constexpr int NR_TESTS = 2;
 
-void testStringClear() noexcept
+class TestStringClear final : public RunIn
 {
-    runInMsgIterClsInit([](const bt2::SelfMessageIterator self) {
+public:
+    void onMsgIterInit(const bt2::SelfMessageIterator self) override
+    {
         /* Boilerplate to get a string field */
         const auto traceCls = self.component().createTraceClass();
         const auto streamCls = traceCls->createStreamClass();
@@ -39,8 +41,8 @@ void testStringClear() noexcept
         field.clear();
         ok(field.value() == "", "string field is empty");
         ok(field.length() == 0, "string field length is 0");
-    });
-}
+    }
+};
 
 } /* namespace */
 
@@ -48,7 +50,8 @@ int main()
 {
     plan_tests(NR_TESTS);
 
-    testStringClear();
+    TestStringClear testStringClear;
+    runIn(testStringClear);
 
     return exit_status();
 }