BareMetal: Hide plugin test classes to .cpp

Change-Id: Idea4e2402eee0b3b0a4f3beba5f56b8e8020a34c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

7 files changed, 49 insertions, 27 deletions

diff --git a/src/plugins/baremetal/baremetalplugin.cpp b/src/plugins/baremetal/baremetalplugin.cpp
index 34164eed34..56d1fb9213 100644
--- a/src/plugins/baremetal/baremetalplugin.cpp
+++ b/src/plugins/baremetal/baremetalplugin.cpp
@@ -36,9 +36,9 @@ class BareMetalPlugin final : public ExtensionSystem::IPlugin
         setupBareMetalDebugSupport();
 
 #ifdef WITH_TESTS
-        addTest<IarParserTest>();
-        addTest<KeilParserTest>();
-        addTest<SdccParserTest>();
+        addTestCreator(createIarParserTest);
+        addTestCreator(createKeilParserTest);
+        addTestCreator(createSdccParserTest);
 #endif
     }
 
diff --git a/src/plugins/baremetal/iarewparser.cpp b/src/plugins/baremetal/iarewparser.cpp
index 35d56c5032..5a05992047 100644
--- a/src/plugins/baremetal/iarewparser.cpp
+++ b/src/plugins/baremetal/iarewparser.cpp
@@ -231,6 +231,15 @@ void IarParser::flush()
 
 namespace BareMetal::Internal {
 
+class IarParserTest final : public QObject
+{
+   Q_OBJECT
+
+private slots:
+   void testIarOutputParsers_data();
+   void testIarOutputParsers();
+};
+
 void IarParserTest::testIarOutputParsers_data()
 {
     QTest::addColumn<QString>("input");
@@ -409,3 +418,5 @@ void IarParserTest::testIarOutputParsers()
 } // BareMetal::Internal
 
 #endif // WITH_TESTS
+
+#include "iarewparser.moc"
diff --git a/src/plugins/baremetal/iarewparser.h b/src/plugins/baremetal/iarewparser.h
index 4c64e0b80f..949967b049 100644
--- a/src/plugins/baremetal/iarewparser.h
+++ b/src/plugins/baremetal/iarewparser.h
@@ -39,14 +39,7 @@ private:
 };
 
 #ifdef WITH_TESTS
-class IarParserTest final : public QObject
-{
-   Q_OBJECT
-
-private slots:
-   void testIarOutputParsers_data();
-   void testIarOutputParsers();
-};
+QObject *createIarParserTest();
 #endif // WITH_TESTS
 
 } // BareMetal::Internal
diff --git a/src/plugins/baremetal/keilparser.cpp b/src/plugins/baremetal/keilparser.cpp
index 5d42203c07..4ae0c6aa64 100644
--- a/src/plugins/baremetal/keilparser.cpp
+++ b/src/plugins/baremetal/keilparser.cpp
@@ -253,6 +253,15 @@ void KeilParser::flush()
 
 namespace BareMetal::Internal {
 
+class KeilParserTest final : public QObject
+{
+   Q_OBJECT
+
+private slots:
+   void testKeilOutputParsers_data();
+   void testKeilOutputParsers();
+};
+
 void KeilParserTest::testKeilOutputParsers_data()
 {
     QTest::addColumn<QString>("input");
@@ -520,6 +529,13 @@ void KeilParserTest::testKeilOutputParsers()
                           outputLines);
 }
 
+QObject *createKeilParserTest()
+{
+    return new KeilParserTest;
+}
+
 } // BareMetal::Internal
 
 #endif // WITH_TESTS
+
+#include "keilparser.moc"
diff --git a/src/plugins/baremetal/keilparser.h b/src/plugins/baremetal/keilparser.h
index 3dd315fca8..4d8e9d0bc8 100644
--- a/src/plugins/baremetal/keilparser.h
+++ b/src/plugins/baremetal/keilparser.h
@@ -36,14 +36,7 @@ private:
 };
 
 #ifdef WITH_TESTS
-class KeilParserTest final : public QObject
-{
-   Q_OBJECT
-
-private slots:
-   void testKeilOutputParsers_data();
-   void testKeilOutputParsers();
-};
+QObject *createKeilParserTest();
 #endif // WITH_TESTS
 
 } // BareMetal::Internal
diff --git a/src/plugins/baremetal/sdccparser.cpp b/src/plugins/baremetal/sdccparser.cpp
index 9115e3e504..aa97173f85 100644
--- a/src/plugins/baremetal/sdccparser.cpp
+++ b/src/plugins/baremetal/sdccparser.cpp
@@ -146,6 +146,15 @@ void SdccParser::flush()
 
 namespace BareMetal::Internal {
 
+class SdccParserTest final : public QObject
+{
+   Q_OBJECT
+
+private slots:
+   void testSdccOutputParsers_data();
+   void testSdccOutputParsers();
+};
+
 void SdccParserTest::testSdccOutputParsers_data()
 {
     QTest::addColumn<QString>("input");
@@ -306,6 +315,13 @@ void SdccParserTest::testSdccOutputParsers()
                           outputLines);
 }
 
+QObject *createSdccParserTest()
+{
+    return new SdccParserTest;
+}
+
 } // BareMetal::Internal
 
 #endif // WITH_TESTS
+
+#include "sdccparser.moc"
diff --git a/src/plugins/baremetal/sdccparser.h b/src/plugins/baremetal/sdccparser.h
index b2f904dfcd..cf02bdaa50 100644
--- a/src/plugins/baremetal/sdccparser.h
+++ b/src/plugins/baremetal/sdccparser.h
@@ -26,14 +26,7 @@ private:
 };
 
 #ifdef WITH_TESTS
-class SdccParserTest final : public QObject
-{
-   Q_OBJECT
-
-private slots:
-   void testSdccOutputParsers_data();
-   void testSdccOutputParsers();
-};
+QObject *createSdccParserTest();
 #endif // WITH_TESTS
 
 } // BareMetal::Internal