Converting all tests

Author: MaciejKaszynski

tests/integration/complex_monitoring/component_complex_monitoring.cpp

@@ -59,14 +59,15 @@ TEST(ComplexMonitoring, ComponentComplexMonitoring)
             std::this_thread::sleep_for(75ms);
             heartbeat_monitor.Heartbeat();
         }
-        EXPECT_FALSE(TestRunner::exitRequested) << "Process should not be terminated yet";
+        EXPECT_FALSE(TestRunner::g_exit_requested) << "Process should not be terminated yet";
     }
     // When heartbeats are no longer sent...
 }
 
 int main()
 {
-    TestRunner(__FILE__, TerminationBehavior::kContinue).RunTests();
+    TestRunner::Init();
+    TestRunner::RunTests();
     // Then expect kill due to recovery action (verified by state manager)
     while (true)  // Stop reporting, wait for sigkill
     {

tests/integration/complex_monitoring/control_client_test_driver.cpp

@@ -79,15 +79,13 @@ TEST(ComplexMonitoring, ControlClientTestDriver)
         // did not just send an event without taking the action.
         EXPECT_TRUE(std::filesystem::exists(fallback_file)) << "Fallback Run Target was not activated";
     }
-
-    TEST_STEP("Activate Off Run Target")
-    {
-        const auto result = client->activate_run_target("Off", true);
-        EXPECT_TRUE(result.has_value()) << result.error().Message();
-    }
 }
 
 int main()
 {
-    return TestRunner(__FILE__, TerminationBehavior::kWait, TerminationNotification::kTestEnd).RunTests();
+    TestRunner::Init();
+    const auto result = TestRunner::RunTests();
+    TestRunner::EndTest();
+    TestRunner::WaitForTermination();
+    return result;
 }

tests/integration/crash_ignores_dependents/process_crashing_once.cpp

@@ -46,5 +46,6 @@ TEST(CrashIgnoresDependents, CrashingProcess)
 
 int main()
 {
-    TestRunner(__FILE__, TerminationBehavior::kContinue).RunTests();
+    TestRunner::Init();
+    TestRunner::RunTests();
 }

tests/integration/crash_ignores_dependents/test_process.cpp

@@ -52,5 +52,8 @@ TEST(CrashIgnoresDependents, TestProcess)
 
 int main()
 {
-    return TestRunner(__FILE__, TerminationBehavior::kContinue, TerminationNotification::kTestEnd).RunTests();
+    TestRunner::Init();
+    const auto result = TestRunner::RunTests();
+    TestRunner::EndTest();
+    return result;
 }

tests/integration/crash_on_startup/control_client_test_driver.cpp

@@ -100,15 +100,13 @@ TEST(CrashOnStartup, ControlClientTestDriver)
         // did not just send an event without taking the action.
         EXPECT_TRUE(std::filesystem::exists(fallback_file)) << "Fallback Run Target should have been activated";
     }
-
-    TEST_STEP("Activate Run Target Off")
-    {
-        const auto result = client->activate_run_target("Off", true);
-        EXPECT_TRUE(result.has_value()) << result.error().Message();
-    }
 }
 
 int main()
 {
-    return TestRunner(__FILE__, TerminationBehavior::kWait, TerminationNotification::kTestEnd).RunTests();
+    TestRunner::Init();
+    const auto result = TestRunner::RunTests();
+    TestRunner::EndTest();
+    TestRunner::WaitForTermination();
+    return result;
 }

tests/integration/explicit_fallback_request/control_client_test_driver.cpp

@@ -62,15 +62,13 @@ TEST(ExplicitFallbackRequest, ControlClientTestDriver)
             EXPECT_EQ(target, "fallback_run_target");
         }
     });
-
-    TEST_STEP("Activate Run Target Off")
-    {
-        const auto result = client->activate_run_target("Off", true);
-        EXPECT_TRUE(result.has_value()) << result.error().Message();
-    }
 }
 
 int main()
 {
-    return TestRunner(__FILE__, TerminationBehavior::kWait, TerminationNotification::kTestEnd).RunTests();
+    TestRunner::Init();
+    const auto result = TestRunner::RunTests();
+    TestRunner::EndTest();
+    TestRunner::WaitForTermination();
+    return result;
 }

tests/integration/fallback_to_same_target_restarts/control_client_test_driver.cpp

@@ -86,15 +86,13 @@ TEST(FallbackToSameTargetRestarts, ControlClientTestDriver)
     {
         EXPECT_TRUE(std::filesystem::exists(process_file)) << "Process did not restart successfully";
     }
-
-    TEST_STEP("Activate Run Target Off")
-    {
-        const auto result = client->activate_run_target("Off", true);
-        EXPECT_TRUE(result.has_value()) << result.error().Message();
-    }
 }
 
 int main()
 {
-    return TestRunner(__FILE__, TerminationBehavior::kWait, TerminationNotification::kTestEnd).RunTests();
+    TestRunner::Init();
+    const auto result = TestRunner::RunTests();
+    TestRunner::EndTest();
+    TestRunner::WaitForTermination();
+    return result;
 }

tests/integration/fallback_to_same_target_restarts/process_crashing_once.cpp

@@ -57,5 +57,6 @@ TEST(FallbackToSameTargetRestarts, CrashingProcess)
 
 int main()
 {
-    TestRunner(__FILE__, TerminationBehavior::kContinue).RunTests();
+    TestRunner::Init();
+    TestRunner::RunTests();
 }

tests/integration/incorrect_config_non_reporting/non_reporting_process.cpp

@@ -47,5 +47,8 @@ TEST(NonReporting, Process)
 
 int main()
 {
-    return TestRunner(__FILE__, TerminationBehavior::kContinue, TerminationNotification::kTestEnd).RunTests();
+    TestRunner::Init();
+    const auto result = TestRunner::RunTests();
+    TestRunner::EndTest();
+    return result;
 }

tests/integration/lm_shutdown_during_rt_switch/component_c.cpp

@@ -34,13 +34,11 @@ TEST(LmShutdownDuringRtSwitch, ComponentC)
         score::mw::lifecycle::report_running();
     }
 
-    while (!TestRunner::exitRequested)
-    {
-        pause();
-    }
+    TestRunner::WaitForTermination();
 }
 
 int main()
 {
-    return TestRunner(__FILE__).RunTests();
+    TestRunner::Init();
+    return TestRunner::RunTests();
 }