PerfProfiler: Move resource counter test creation closer to test code

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

src/plugins/perfprofiler/perfprofilerplugin.cpp

@@ -29,7 +29,7 @@ class PerfProfilerPlugin final : public ExtensionSystem::IPlugin
 
 #if WITH_TESTS
         //   addTest<PerfProfilerTraceFileTest>();  // FIXME these tests have to get rewritten
-        addTest<PerfResourceCounterTest>();
+        addTestCreator(createPerfResourceCounterTest);
 #endif // WITH_TESTS
     }
 

src/plugins/perfprofiler/tests/perfresourcecounter_test.cpp

@@ -5,8 +5,7 @@
 #include <perfprofiler/perfresourcecounter.h>
 #include <QtTest>
 
-namespace PerfProfiler {
+namespace PerfProfiler::Internal {
-namespace Internal {
 
 struct SizePayload : public NoPayload
 {
@@ -71,6 +70,22 @@ static void fill(Counter &counter, const typename Counter::Container &container,
     QCOMPARE(sum(container), 0);
 }
 
+class PerfResourceCounterTest final : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void testMallocFree();
+    void testRandomFill();
+    void testUnitSized();
+    void testRandomAlternate();
+    void testGuesses();
+    void testNegative();
+    void testInvalidId();
+    void testMultiCounter();
+    void testMove();
+};
+
 void PerfResourceCounterTest::testMallocFree()
 {
     SizeCounter::Container intContainer;
@@ -345,6 +360,11 @@ void PerfResourceCounterTest::testMove()
     QCOMPARE(counter.currentTotal(), 500ll);
 }
 
-} // namespace Internal
+QObject *createPerfResourceCounterTest()
-} // namespace PerfProfiler
+{
+    return new PerfResourceCounterTest;
+}
 
+} // PerfProfiler::Internal
+
+#include "perfresourcecounter_test.moc"

src/plugins/perfprofiler/tests/perfresourcecounter_test.h

@@ -5,23 +5,8 @@
 
 #include <QObject>
 
-namespace PerfProfiler {
+namespace PerfProfiler::Internal {
-namespace Internal {
 
-class PerfResourceCounterTest : public QObject
+QObject *createPerfResourceCounterTest();
-{
-    Q_OBJECT
-private slots:
-    void testMallocFree();
-    void testRandomFill();
-    void testUnitSized();
-    void testRandomAlternate();
-    void testGuesses();
-    void testNegative();
-    void testInvalidId();
-    void testMultiCounter();
-    void testMove();
-};
 
-} // namespace Internal
+} // PerfProfiler::Internal
-} // namespace PerfProfiler