Nim: Move parser test definition closer to the tested code

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

4 files changed, 24 insertions, 13 deletions

diff --git a/src/plugins/nim/nimplugin.cpp b/src/plugins/nim/nimplugin.cpp
index 6cca4f9005..51b799c10d 100644
--- a/src/plugins/nim/nimplugin.cpp
+++ b/src/plugins/nim/nimplugin.cpp
@@ -6,17 +6,18 @@
 #include "nimconstants.h"
 #include "nimtr.h"
 #include "editor/nimeditorfactory.h"
-#include "project/nimblerunconfiguration.h"
 #include "project/nimblebuildconfiguration.h"
+#include "project/nimblebuildstep.h"
+#include "project/nimbleproject.h"
+#include "project/nimblerunconfiguration.h"
+#include "project/nimbletaskstep.h"
 #include "project/nimbuildconfiguration.h"
 #include "project/nimcompilerbuildstep.h"
 #include "project/nimcompilercleanstep.h"
+#include "project/nimoutputtaskparser.h"
 #include "project/nimproject.h"
-#include "project/nimbleproject.h"
 #include "project/nimrunconfiguration.h"
 #include "project/nimtoolchain.h"
-#include "project/nimblebuildstep.h"
-#include "project/nimbletaskstep.h"
 #include "settings/nimcodestylepreferencesfactory.h"
 #include "settings/nimcodestylesettingspage.h"
 
@@ -69,6 +70,10 @@ void NimPlugin::initialize()
 {
     d = new NimPluginPrivate;
 
+#ifdef WITH_TESTS
+    addTest<NimParserTest>();
+#endif
+
     ToolchainManager::registerLanguage(Constants::C_NIMLANGUAGE_ID, Constants::C_NIMLANGUAGE_NAME);
 
     TextEditor::SnippetProvider::registerGroup(Constants::C_NIMSNIPPETSGROUP_ID,
diff --git a/src/plugins/nim/nimplugin.h b/src/plugins/nim/nimplugin.h
index a50e371b2e..a8f159fb7e 100644
--- a/src/plugins/nim/nimplugin.h
+++ b/src/plugins/nim/nimplugin.h
@@ -19,12 +19,6 @@ public:
     void initialize() final;
     void extensionsInitialized() final;
 
-#ifdef WITH_TESTS
-private slots:
-    void testNimParser_data();
-    void testNimParser();
-#endif
-
 private:
     class NimPluginPrivate *d = nullptr;
 };
diff --git a/src/plugins/nim/project/nimoutputtaskparser.cpp b/src/plugins/nim/project/nimoutputtaskparser.cpp
index a0962daafc..b31d67c870 100644
--- a/src/plugins/nim/project/nimoutputtaskparser.cpp
+++ b/src/plugins/nim/project/nimoutputtaskparser.cpp
@@ -56,7 +56,7 @@ NimParser::Result NimParser::handleLine(const QString &lne, OutputFormat)
 
 namespace Nim {
 
-void NimPlugin::testNimParser_data()
+void NimParserTest::testNimParser_data()
 {
     QTest::addColumn<QString>("input");
     QTest::addColumn<OutputParserTester::Channel>("inputChannel");
@@ -97,7 +97,7 @@ void NimPlugin::testNimParser_data()
             << QString();
 }
 
-void NimPlugin::testNimParser()
+void NimParserTest::testNimParser()
 {
     OutputParserTester testbench;
     testbench.addLineParser(new NimParser);
@@ -113,5 +113,6 @@ void NimPlugin::testNimParser()
                           outputLines);
 }
 
-}
+} // Nim
+
 #endif
diff --git a/src/plugins/nim/project/nimoutputtaskparser.h b/src/plugins/nim/project/nimoutputtaskparser.h
index 2099cd1f89..601e913436 100644
--- a/src/plugins/nim/project/nimoutputtaskparser.h
+++ b/src/plugins/nim/project/nimoutputtaskparser.h
@@ -12,4 +12,15 @@ class NimParser : public ProjectExplorer::OutputTaskParser
     Result handleLine(const QString &line, Utils::OutputFormat) override;
 };
 
+#ifdef WITH_TESTS
+class NimParserTest final : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void testNimParser_data();
+    void testNimParser();
+};
+#endif
+
 } // Nim