Fix main app scope in tests

It didn't clean up the old ones, causing unpredictable problems.

Fix main app scope in tests
It didn't clean up the old ones, causing unpredictable problems.
Wiebe Cazemier
1 parent e1c7b86f
Showing 3 changed files with 10 additions and 4 deletions
FlashMQTests/mainappthread.cpp
FlashMQTests/mainappthread.h
FlashMQTests/tst_maintests.cpp
@@ -19,15 +19,19 @@ License along with FlashMQ. If not, see &lt;https://www.gnu.org/licenses/&gt;.
  
 MainAppThread::MainAppThread(QObject *parent) : QThread(parent)
 {
+    MainApp::initMainApp(1, nullptr);
+    appInstance = MainApp::getMainApp();
+    appInstance->settings->allowAnonymous = true;
+}
+
+MainAppThread::~MainAppThread()
+{
     if (appInstance)
     {
         delete appInstance;
+        MainApp::instance = nullptr;
     }
     appInstance = nullptr;
-    MainApp::instance = nullptr;
-    MainApp::initMainApp(1, nullptr);
-    appInstance = MainApp::getMainApp();
-    appInstance->settings->allowAnonymous = true;
 }
  
 void MainAppThread::run()
@@ -28,6 +28,7 @@ class MainAppThread : public QThread
     MainApp *appInstance = nullptr;
 public:
     explicit MainAppThread(QObject *parent = nullptr);
+    ~MainAppThread();
  
 public slots:
     void run() override;
@@ -102,6 +102,7 @@ MainTests::~MainTests()
  
 void MainTests::init()
 {
+    mainApp.reset();
     mainApp.reset(new MainAppThread());
     mainApp->start();
     mainApp->waitForStarted();