Garantuee test clean up

FlashMQTests/CMakeLists.txt

@@ -165,6 +165,7 @@ add_executable(flashmq-tests
     websockettests.cpp
     willtests.cpp
     dnstests.cpp
+    testinitializer.h testinitializer.cpp
 
     )
 

FlashMQTests/maintests.cpp

@@ -1,5 +1,6 @@
 #include "maintests.h"
 #include "testhelpers.h"
+#include "testinitializer.h"
 
 #include "threadglobals.h"
 
@@ -319,7 +320,9 @@ bool MainTests::test(const std::vector<std::string> &tests)
         try
         {
             std::cout << CYAN << "INIT" << COLOR_END << ": " << pair.first << std::endl;
-            initBeforeEachTest();
+
+            TestInitializer testInitializer(this);
+            testInitializer.init();
 
             const int failCountBefore = assert_fail_count;
             const int assertCountBefore = assert_count;
@@ -330,7 +333,7 @@ bool MainTests::test(const std::vector<std::string> &tests)
             const int failCountAfter = assert_fail_count;
             const int assertCountAfter = assert_count;
 
-            cleanupAfterEachTest(); // TODO: RAII
+            testInitializer.cleanup();
 
             if (assertCountBefore == assertCountAfter)
             {

FlashMQTests/maintests.h

@@ -11,6 +11,8 @@
 
 class MainTests
 {
+    friend class TestInitializer;
+
     std::unique_ptr<MainAppInThread> mainApp;
     std::shared_ptr<ThreadData> dummyThreadData;
 

FlashMQTests/testinitializer.cpp

@@ -0,0 +1,29 @@
+#include "testinitializer.h"
+
+TestInitializer::TestInitializer(MainTests *tests) :
+    tests(tests)
+{
+
+}
+
+void TestInitializer::init()
+{
+    if (!tests)
+        return;
+
+    tests->initBeforeEachTest();
+}
+
+void TestInitializer::cleanup()
+{
+    if (!tests)
+        return;
+
+    tests->cleanupAfterEachTest();
+    tests = nullptr;
+}
+
+TestInitializer::~TestInitializer()
+{
+    cleanup();
+}

FlashMQTests/testinitializer.h

@@ -0,0 +1,25 @@
+#ifndef TESTINITIALIZER_H
+#define TESTINITIALIZER_H
+
+#include "maintests.h"
+
+/**
+ * @brief Simple RAII way to make sure test cleanup is run.
+ */
+class TestInitializer
+{
+    MainTests *tests = nullptr;
+
+public:
+    TestInitializer(MainTests *tests);
+    virtual ~TestInitializer();
+
+    TestInitializer(const TestInitializer &other) = delete;
+    TestInitializer(TestInitializer &&other) = delete;
+    TestInitializer &operator=(const TestInitializer &other) = delete;
+
+    void init();
+    void cleanup();
+};
+
+#endif // TESTINITIALIZER_H