Vcpkg: Move test creation closer to tested code

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

src/plugins/vcpkg/vcpkg_test.cpp

@@ -10,11 +10,16 @@
 
 namespace Vcpkg::Internal {
 
-VcpkgSearchTest::VcpkgSearchTest(QObject *parent)
+class VcpkgSearchTest : public QObject
-    : QObject(parent)
+{
-{ }
+    Q_OBJECT
 
-VcpkgSearchTest::~VcpkgSearchTest() = default;
+private slots:
+    void testVcpkgJsonParser_data();
+    void testVcpkgJsonParser();
+    void testAddDependency_data();
+    void testAddDependency();
+};
 
 void VcpkgSearchTest::testVcpkgJsonParser_data()
 {
@@ -178,4 +183,11 @@ void VcpkgSearchTest::testAddDependency()
     QCOMPARE(QString::fromUtf8(result), modifiedVcpkgManifestJsonData);
 }
 
+QObject *createVcpkgSearchTest()
+{
+    return new VcpkgSearchTest;
+}
+
 } // namespace Vcpkg::Internal
+
+#include "vcpkg_test.moc"

src/plugins/vcpkg/vcpkg_test.h

@@ -3,24 +3,10 @@
 
 #pragma once
 
-#include <coreplugin/dialogs/ioptionspage.h>
+#include <QObject>
-#include <utils/aspects.h>
 
 namespace Vcpkg::Internal {
 
-class VcpkgSearchTest : public QObject
+QObject *createVcpkgSearchTest();
-{
-    Q_OBJECT
-
-public:
-    VcpkgSearchTest(QObject *parent = nullptr);
-    ~VcpkgSearchTest();
-
-private slots:
-    void testVcpkgJsonParser_data();
-    void testVcpkgJsonParser();
-    void testAddDependency_data();
-    void testAddDependency();
-};
 
 } // namespace Vcpkg::Internal

src/plugins/vcpkg/vcpkgplugin.cpp

@@ -26,7 +26,7 @@ public:
         setupVcpkgManifestEditor();
 
 #ifdef WITH_TESTS
-        addTest<VcpkgSearchTest>();
+        addTestCreator(createVcpkgSearchTest);
 #endif
     }