Merge PR #580: Remove extern plugin info from testlib header

tests/auto/configurations/testconfigurations.cpp

@@ -32,6 +32,7 @@
 #include "nymeacore.h"
 #include "nymeasettings.h"
 #include "servers/mocktcpserver.h"
+#include "../plugins/mock/extern-plugininfo.h"
 
 using namespace nymeaserver;
 

tests/auto/integrations/testintegrations.cpp

@@ -37,6 +37,7 @@
 
 #include "servers/mocktcpserver.h"
 #include "jsonrpc/integrationshandler.h"
+#include "../plugins/mock/extern-plugininfo.h"
 
 using namespace nymeaserver;
 

tests/auto/ioconnections/testioconnections.cpp

@@ -38,6 +38,8 @@
 #include "servers/mocktcpserver.h"
 #include "jsonrpc/integrationshandler.h"
 
+#include "../plugins/mock/extern-plugininfo.h"
+
 using namespace nymeaserver;
 
 class TestIOConnections : public NymeaTestBase

tests/auto/jsonrpc/testjsonrpc.cpp

@@ -35,6 +35,7 @@
 #include "servers/mocktcpserver.h"
 #include "usermanager/usermanager.h"
 #include "nymeadbusservice.h"
+#include "../plugins/mock/extern-plugininfo.h"
 
 using namespace nymeaserver;
 

tests/auto/logging/testlogging.cpp

@@ -34,6 +34,8 @@
 #include "logging/logvaluetool.h"
 #include "servers/mocktcpserver.h"
 
+#include "../plugins/mock/extern-plugininfo.h"
+
 #include <qglobal.h>
 
 using namespace nymeaserver;

tests/auto/rules/testrules.cpp

@@ -33,6 +33,7 @@
 #include "servers/mocktcpserver.h"
 #include "nymeacore.h"
 #include "jsonrpc/jsonhandler.h"
+#include "../plugins/mock/extern-plugininfo.h"
 
 using namespace nymeaserver;
 

tests/auto/scripts/testscripts.cpp

@@ -35,6 +35,8 @@
 #include "nymeacore.h"
 #include "scriptengine/scriptengine.h"
 
+#include "../plugins/mock/extern-plugininfo.h"
+
 #include <QtQml/qqml.h>
 
 using namespace nymeaserver;

tests/auto/tags/testtags.cpp

@@ -31,6 +31,7 @@
 #include "nymeatestbase.h"
 #include "servers/mocktcpserver.h"
 #include "tagging/tagsstorage.h"
+#include "../plugins/mock/extern-plugininfo.h"
 
 using namespace nymeaserver;
 

tests/auto/timemanager/testtimemanager.cpp

@@ -35,6 +35,8 @@
 #include "platform/platform.h"
 #include "platform/platformsystemcontroller.h"
 
+#include "../plugins/mock/extern-plugininfo.h"
+
 using namespace nymeaserver;
 
 class TestTimeManager: public NymeaTestBase

tests/testlib/nymeatestbase.h

@@ -1,6 +1,6 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 *
-* Copyright 2013 - 2020, nymea GmbH
+* Copyright 2013 - 2022, nymea GmbH
 * Contact: contact@nymea.io
 *
 * This file is part of nymea.
@@ -35,11 +35,12 @@
 #include <QtTest>
 #include <QNetworkRequest>
 #include <QNetworkReply>
+#include <QLoggingCategory>
+
+#include <typeutils.h>
 
 Q_DECLARE_LOGGING_CATEGORY(dcTests)
 
-#include "../plugins/mock/extern-plugininfo.h"
-
 namespace nymeaserver {
 class MockTcpServer;