move servers into subdir, cleanup some includes

libnymea-core/debugreportgenerator.cpp

@@ -22,6 +22,7 @@
 #include "loggingcategories.h"
 #include "nymeasettings.h"
 #include "nymeacore.h"
+#include "nymeaconfiguration.h"
 
 #include <QDir>
 #include <QFile>

libnymea-core/debugserverhandler.cpp

@@ -19,21 +19,28 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "nymeacore.h"
-#include "httpreply.h"
+#include "servers/httprequest.h"
+#include "servers/httpreply.h"
+#include "servers/rest/restresource.h"
 #include "nymeasettings.h"
-#include "httprequest.h"
 #include "loggingcategories.h"
 #include "debugserverhandler.h"
+#include "nymeaconfiguration.h"
 #include "stdio.h"
 
 #include <QXmlStreamWriter>
 #include <QCoreApplication>
 #include <QMessageLogger>
 #include <QJsonDocument>
+#include <QXmlStreamWriter>
+#include <QCoreApplication>
+#include <QFileInfo>
+#include <QWebSocket>
 
 QtMessageHandler DebugServerHandler::s_oldLogMessageHandler = nullptr;
 QList<QWebSocket*> DebugServerHandler::s_websocketClients;
 
+
 namespace nymeaserver {
 
 DebugServerHandler::DebugServerHandler(QObject *parent) :

libnymea-core/debugserverhandler.h

@@ -27,8 +27,8 @@
 #include <QUrlQuery>
 #include <QWebSocketServer>
 
-#include "httpreply.h"
 #include "debugreportgenerator.h"
+#include "servers/httpreply.h"
 
 namespace nymeaserver {
 

libnymea-core/jsonrpc/jsonrpcserver.cpp

@@ -54,7 +54,6 @@
 #include "eventhandler.h"
 #include "logginghandler.h"
 #include "statehandler.h"
-#include "websocketserver.h"
 #include "configurationhandler.h"
 #include "networkmanagerhandler.h"
 #include "tagshandler.h"

libnymea-core/libnymea-core.pro

@@ -16,19 +16,27 @@ RESOURCES += $$top_srcdir/icons.qrc \
 
 
 HEADERS += nymeacore.h \
-    tcpserver.h \
-    mocktcpserver.h \
     ruleengine.h \
     rule.h \
     stateevaluator.h \
-    webserver.h \
     transportinterface.h \
-    servermanager.h \
-    httprequest.h \
-    websocketserver.h \
-    httpreply.h \
     nymeaconfiguration.h \
-    bluetoothserver.h \
+    servermanager.h \
+    servers/tcpserver.h \
+    servers/mocktcpserver.h \
+    servers/webserver.h \
+    servers/httprequest.h \
+    servers/httpreply.h \
+    servers/bluetoothserver.h \
+    servers/rest/restserver.h \
+    servers/rest/restresource.h \
+    servers/rest/devicesresource.h \
+    servers/rest/deviceclassesresource.h \
+    servers/rest/vendorsresource.h \
+    servers/rest/logsresource.h \
+    servers/rest/pluginsresource.h \
+    servers/rest/rulesresource.h \
+    servers/websocketserver.h \
     jsonrpc/jsonrpcserver.h \
     jsonrpc/jsonhandler.h \
     jsonrpc/devicehandler.h \
@@ -45,14 +53,6 @@ HEADERS += nymeacore.h \
     logging/logfilter.h \
     logging/logentry.h \
     logging/logvaluetool.h \
-    rest/restserver.h \
-    rest/restresource.h \
-    rest/devicesresource.h \
-    rest/deviceclassesresource.h \
-    rest/vendorsresource.h \
-    rest/logsresource.h \
-    rest/pluginsresource.h \
-    rest/rulesresource.h \
     time/timedescriptor.h \
     time/calendaritem.h \
     time/repeatingoption.h \
@@ -100,19 +100,27 @@ HEADERS += nymeacore.h \
     debugreportgenerator.h
 
 SOURCES += nymeacore.cpp \
-    tcpserver.cpp \
-    mocktcpserver.cpp \
     ruleengine.cpp \
     rule.cpp \
     stateevaluator.cpp \
-    webserver.cpp \
     transportinterface.cpp \
-    servermanager.cpp \
-    httprequest.cpp \
-    websocketserver.cpp \
-    httpreply.cpp \
     nymeaconfiguration.cpp \
-    bluetoothserver.cpp \
+    servermanager.cpp \
+    servers/tcpserver.cpp \
+    servers/mocktcpserver.cpp \
+    servers/webserver.cpp \
+    servers/httprequest.cpp \
+    servers/httpreply.cpp \
+    servers/websocketserver.cpp \
+    servers/bluetoothserver.cpp \
+    servers/rest/restserver.cpp \
+    servers/rest/restresource.cpp \
+    servers/rest/devicesresource.cpp \
+    servers/rest/deviceclassesresource.cpp \
+    servers/rest/vendorsresource.cpp \
+    servers/rest/logsresource.cpp \
+    servers/rest/pluginsresource.cpp \
+    servers/rest/rulesresource.cpp \
     jsonrpc/jsonrpcserver.cpp \
     jsonrpc/jsonhandler.cpp \
     jsonrpc/devicehandler.cpp \
@@ -128,14 +136,6 @@ SOURCES += nymeacore.cpp \
     logging/logfilter.cpp \
     logging/logentry.cpp \
     logging/logvaluetool.cpp \
-    rest/restserver.cpp \
-    rest/restresource.cpp \
-    rest/devicesresource.cpp \
-    rest/deviceclassesresource.cpp \
-    rest/vendorsresource.cpp \
-    rest/logsresource.cpp \
-    rest/pluginsresource.cpp \
-    rest/rulesresource.cpp \
     time/timedescriptor.cpp \
     time/calendaritem.cpp \
     time/repeatingoption.cpp \

libnymea-core/nymeacore.h

@@ -50,6 +50,7 @@ class LogEngine;
 class NetworkManager;
 class NymeaConfiguration;
 class TagsStorage;
+class UserManager;
 
 class NymeaCore : public QObject
 {

libnymea-core/servermanager.cpp

@@ -37,6 +37,15 @@
 #include "nymeacore.h"
 #include "certificategenerator.h"
 #include "nymeasettings.h"
+#include "nymeaconfiguration.h"
+
+#include "jsonrpc/jsonrpcserver.h"
+#include "servers/mocktcpserver.h"
+#include "servers/tcpserver.h"
+#include "servers/rest/restserver.h"
+#include "servers/websocketserver.h"
+#include "servers/webserver.h"
+#include "servers/bluetoothserver.h"
 
 #include <QSslCertificate>
 #include <QSslConfiguration>
@@ -121,6 +130,8 @@ ServerManager::ServerManager(NymeaConfiguration *configuration, QObject *parent)
         m_webServers.insert(config.id, webServer);
     }
 
+
+
     connect(configuration, &NymeaConfiguration::tcpServerConfigurationChanged, this, &ServerManager::tcpServerConfigurationChanged);
     connect(configuration, &NymeaConfiguration::tcpServerConfigurationRemoved, this, &ServerManager::tcpServerConfigurationRemoved);
     connect(configuration, &NymeaConfiguration::webSocketServerConfigurationChanged, this, &ServerManager::webSocketServerConfigurationChanged);

libnymea-core/servermanager.h

@@ -24,24 +24,28 @@
 #include <QObject>
 
 #include "loggingcategories.h"
-#include "jsonrpc/jsonrpcserver.h"
-#include "rest/restserver.h"
-#include "websocketserver.h"
-#include "bluetoothserver.h"
-#include "tcpserver.h"
-#include "mocktcpserver.h"
 
-class QSslConfiguration;
-class QSslCertificate;
-class QSslKey;
+#include <QSslConfiguration>
+#include <QSslKey>
+
+class MockTcpServer;
 
 namespace nymeaserver {
 
+class NymeaConfiguration;
+class JsonRPCServer;
+class TcpServer;
+class WebSocketServer;
+class WebServer;
+class BluetoothServer;
+class RestServer;
+class MqttBroker;
+
 class ServerManager : public QObject
 {
     Q_OBJECT
 public:
-    explicit ServerManager(NymeaConfiguration *configuration, QObject *parent = 0);
+    explicit ServerManager(NymeaConfiguration *configuration, QObject *parent = nullptr);
 
     // Interfaces
     JsonRPCServer *jsonServer() const;

libnymea-core/servers/rest/deviceclassesresource.cpp

@@ -36,7 +36,7 @@
 */
 
 #include "deviceclassesresource.h"
-#include "httprequest.h"
+#include "servers/httprequest.h"
 #include "nymeacore.h"
 
 #include <QJsonDocument>

libnymea-core/servers/rest/deviceclassesresource.h

@@ -26,7 +26,7 @@
 
 #include "jsonrpc/jsontypes.h"
 #include "restresource.h"
-#include "httpreply.h"
+#include "servers/httpreply.h"
 
 
 namespace nymeaserver {

libnymea-core/servers/rest/devicesresource.cpp

@@ -37,8 +37,8 @@
 
 
 #include "devicesresource.h"
-#include "httpreply.h"
-#include "httprequest.h"
+#include "servers/httpreply.h"
+#include "servers/httprequest.h"
 #include "jsonrpc/jsontypes.h"
 #include "nymeacore.h"
 

libnymea-core/servers/rest/devicesresource.h

@@ -26,7 +26,7 @@
 
 #include "jsonrpc/jsontypes.h"
 #include "restresource.h"
-#include "httpreply.h"
+#include "servers/httpreply.h"
 
 namespace nymeaserver {
 

libnymea-core/servers/rest/logsresource.cpp

@@ -36,7 +36,7 @@
 */
 
 #include "logsresource.h"
-#include "httprequest.h"
+#include "servers/httprequest.h"
 #include "loggingcategories.h"
 #include "nymeacore.h"
 #include "logging/logengine.h"

libnymea-core/servers/rest/logsresource.h

@@ -26,7 +26,7 @@
 
 #include "jsonrpc/jsontypes.h"
 #include "restresource.h"
-#include "httpreply.h"
+#include "servers/httpreply.h"
 
 namespace nymeaserver {
 

libnymea-core/servers/rest/pluginsresource.cpp

@@ -36,7 +36,7 @@
 */
 
 #include "pluginsresource.h"
-#include "httprequest.h"
+#include "servers/httprequest.h"
 #include "loggingcategories.h"
 #include "nymeacore.h"
 

libnymea-core/servers/rest/pluginsresource.h

@@ -26,7 +26,7 @@
 
 #include "jsonrpc/jsontypes.h"
 #include "restresource.h"
-#include "httpreply.h"
+#include "servers/httpreply.h"
 
 namespace nymeaserver {
 

libnymea-core/servers/rest/restresource.cpp

@@ -58,7 +58,7 @@
 */
 
 #include "restresource.h"
-#include "httprequest.h"
+#include "servers/httprequest.h"
 #include "loggingcategories.h"
 #include "devicemanager.h"
 

libnymea-core/servers/rest/restresource.h

@@ -24,8 +24,8 @@
 #include <QObject>
 #include <QPair>
 
-#include "httpreply.h"
-#include "httprequest.h"
+#include "servers/httpreply.h"
+#include "servers/httprequest.h"
 #include "jsonrpc/jsontypes.h"
 
 class QVariant;

libnymea-core/servers/rest/restserver.cpp

@@ -36,8 +36,8 @@
 
 #include "restserver.h"
 #include "loggingcategories.h"
-#include "httprequest.h"
-#include "httpreply.h"
+#include "servers/httprequest.h"
+#include "servers/httpreply.h"
 
 #include <QJsonDocument>
 #include <QSslConfiguration>

libnymea-core/servers/rest/restserver.h

@@ -23,7 +23,7 @@
 
 #include <QObject>
 
-#include "webserver.h"
+#include "servers/webserver.h"
 #include "jsonrpc/jsonhandler.h"
 #include "devicesresource.h"
 #include "deviceclassesresource.h"

libnymea-core/servers/rest/rulesresource.cpp

@@ -36,7 +36,7 @@
 */
 
 #include "rulesresource.h"
-#include "httprequest.h"
+#include "servers/httprequest.h"
 #include "typeutils.h"
 #include "loggingcategories.h"
 #include "nymeacore.h"

libnymea-core/servers/rest/rulesresource.h

@@ -26,7 +26,7 @@
 
 #include "jsonrpc/jsontypes.h"
 #include "restresource.h"
-#include "httpreply.h"
+#include "servers/httpreply.h"
 
 
 namespace nymeaserver {

libnymea-core/servers/rest/vendorsresource.cpp

@@ -37,7 +37,7 @@
 
 
 #include "vendorsresource.h"
-#include "httprequest.h"
+#include "servers/httprequest.h"
 #include "loggingcategories.h"
 #include "nymeacore.h"
 

libnymea-core/servers/rest/vendorsresource.h

@@ -26,7 +26,7 @@
 
 #include "jsonrpc/jsontypes.h"
 #include "restresource.h"
-#include "httpreply.h"
+#include "servers/httpreply.h"
 
 namespace nymeaserver {
 

libnymea-core/usermanager.cpp

@@ -72,6 +72,7 @@
 #include <QRegExpValidator>
 #include <QDateTime>
 #include <QDebug>
+#include <QFileInfo>
 
 namespace nymeaserver {
 

server/main.cpp

@@ -33,6 +33,7 @@
 #include <QtDebug>
 #include <QString>
 #include <QFile>
+#include <QDir>
 
 #include "stdio.h"
 #include "unistd.h"

tests/auto/actions/testactions.cpp

@@ -20,16 +20,6 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "nymeatestbase.h"
-#include "devicemanager.h"
-#include "mocktcpserver.h"
-
-#include <QtTest/QtTest>
-#include <QCoreApplication>
-#include <QTcpSocket>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QCoreApplication>
 
 using namespace nymeaserver;
 

tests/auto/configurations/testconfigurations.cpp

@@ -20,18 +20,9 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "nymeatestbase.h"
-#include "devicemanager.h"
-#include "mocktcpserver.h"
 #include "nymeacore.h"
 #include "nymeasettings.h"
-
-#include <QtTest/QtTest>
-#include <QCoreApplication>
-#include <QTcpSocket>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QCoreApplication>
+#include "servers/mocktcpserver.h"
 
 using namespace nymeaserver;
 

tests/auto/devices/testdevices.cpp

@@ -21,15 +21,7 @@
 
 #include "nymeatestbase.h"
 #include "nymeacore.h"
-#include "devicemanager.h"
 #include "nymeasettings.h"
-#include "plugin/deviceplugin.h"
-
-#include <QDebug>
-#include <QSignalSpy>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
 
 using namespace nymeaserver;
 

tests/auto/events/testevents.cpp

@@ -21,16 +21,6 @@
 
 #include "nymeatestbase.h"
 #include "nymeacore.h"
-#include "devicemanager.h"
-#include "mocktcpserver.h"
-
-#include <QtTest/QtTest>
-#include <QCoreApplication>
-#include <QTcpSocket>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QCoreApplication>
 
 using namespace nymeaserver;
 

tests/auto/jsonrpc/testjsonrpc.cpp

@@ -20,19 +20,9 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "nymeatestbase.h"
-#include "nymeacore.h"
-#include "devicemanager.h"
-#include "mocktcpserver.h"
 #include "../../utils/pushbuttonagent.h"
-
-#include <QtTest/QtTest>
-#include <QCoreApplication>
-#include <QTcpSocket>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QCoreApplication>
-#include <QMetaType>
+#include "nymeacore.h"
+#include "servers/mocktcpserver.h"
 
 using namespace nymeaserver;
 

tests/auto/logging/testlogging.cpp

@@ -21,17 +21,9 @@
 
 #include "nymeatestbase.h"
 #include "nymeacore.h"
-#include "devicemanager.h"
 #include "nymeasettings.h"
-#include "logging/logentry.h"
 #include "logging/logvaluetool.h"
-#include "plugin/deviceplugin.h"
-
-#include <QDebug>
-#include <QSignalSpy>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
+#include "servers/mocktcpserver.h"
 
 using namespace nymeaserver;
 

tests/auto/nymeatestbase.cpp

@@ -20,23 +20,9 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "nymeatestbase.h"
-#include "mocktcpserver.h"
 #include "nymeacore.h"
 #include "nymeasettings.h"
-#include "devicemanager.h"
-#include "loggingcategories.h"
-#include "logging/logengine.h"
-#include "jsonrpc/jsontypes.h"
-
-#include <QVariantMap>
-#include <QJsonDocument>
-#include <QJsonParseError>
-#include <QSignalSpy>
-#include <QtTest>
-#include <QDebug>
-#include <QMetaType>
-#include <QNetworkRequest>
-#include <QNetworkReply>
+#include "servers/mocktcpserver.h"
 
 using namespace nymeaserver;
 

tests/auto/nymeatestbase.h

@@ -22,20 +22,10 @@
 #ifndef NYMEATESTBASE_H
 #define NYMEATESTBASE_H
 
-#include "typeutils.h"
-#include "logging/logging.h"
-#include "mocktcpserver.h"
-#include "devicemanager.h"
-#include "ruleengine.h"
 #include "jsonrpc/jsontypes.h"
 
-#include <QObject>
-#include <QUuid>
-#include <QVariantMap>
 #include <QSignalSpy>
 #include <QtTest>
-#include <QNetworkRequest>
-#include <QNetworkReply>
 
 extern DeviceClassId mockDeviceClassId;
 extern DeviceClassId mockDeviceAutoClassId;

tests/auto/plugins/testplugins.cpp

@@ -20,16 +20,6 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "nymeatestbase.h"
-#include "devicemanager.h"
-#include "mocktcpserver.h"
-
-#include <QtTest/QtTest>
-#include <QCoreApplication>
-#include <QTcpSocket>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QCoreApplication>
 
 using namespace nymeaserver;
 

tests/auto/restdeviceclasses/testrestdeviceclasses.cpp

@@ -20,20 +20,6 @@
 
 #include "nymeatestbase.h"
 #include "nymeacore.h"
-#include "devicemanager.h"
-#include "mocktcpserver.h"
-#include "webserver.h"
-
-#include <QtTest/QtTest>
-#include <QCoreApplication>
-#include <QTcpSocket>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QCoreApplication>
-#include <QJsonDocument>
-#include <QHttpPart>
-#include <QMetaType>
 
 using namespace nymeaserver;
 

tests/auto/restdevices/testrestdevices.cpp

@@ -20,20 +20,6 @@
 
 #include "nymeatestbase.h"
 #include "nymeacore.h"
-#include "devicemanager.h"
-#include "mocktcpserver.h"
-#include "webserver.h"
-
-#include <QtTest/QtTest>
-#include <QCoreApplication>
-#include <QTcpSocket>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QCoreApplication>
-#include <QJsonDocument>
-#include <QHttpPart>
-#include <QMetaType>
 
 using namespace nymeaserver;
 

tests/auto/restlogging/testrestlogging.cpp

@@ -21,14 +21,7 @@
 
 #include "nymeatestbase.h"
 #include "nymeacore.h"
-#include "devicemanager.h"
-#include "plugin/deviceplugin.h"
-
-#include <QDebug>
-#include <QSignalSpy>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
+#include "servers/mocktcpserver.h"
 
 using namespace nymeaserver;
 

tests/auto/restplugins/testrestplugins.cpp

@@ -20,20 +20,6 @@
 
 #include "nymeatestbase.h"
 #include "nymeacore.h"
-#include "devicemanager.h"
-#include "mocktcpserver.h"
-#include "webserver.h"
-
-#include <QtTest/QtTest>
-#include <QCoreApplication>
-#include <QTcpSocket>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QCoreApplication>
-#include <QJsonDocument>
-#include <QHttpPart>
-#include <QMetaType>
 
 using namespace nymeaserver;
 

tests/auto/restrules/testrestrules.cpp

@@ -20,20 +20,6 @@
 
 #include "nymeatestbase.h"
 #include "nymeacore.h"
-#include "devicemanager.h"
-#include "mocktcpserver.h"
-#include "webserver.h"
-
-#include <QtTest/QtTest>
-#include <QCoreApplication>
-#include <QTcpSocket>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QCoreApplication>
-#include <QJsonDocument>
-#include <QHttpPart>
-#include <QMetaType>
 
 using namespace nymeaserver;
 

tests/auto/restvendors/testrestvendors.cpp

@@ -20,20 +20,6 @@
 
 #include "nymeatestbase.h"
 #include "nymeacore.h"
-#include "devicemanager.h"
-#include "mocktcpserver.h"
-#include "webserver.h"
-
-#include <QtTest/QtTest>
-#include <QCoreApplication>
-#include <QTcpSocket>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QCoreApplication>
-#include <QJsonDocument>
-#include <QHttpPart>
-#include <QMetaType>
 
 using namespace nymeaserver;
 

tests/auto/rules/testrules.cpp

@@ -20,17 +20,8 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "nymeatestbase.h"
-#include "devicemanager.h"
 #include "nymeasettings.h"
-#include "mocktcpserver.h"
-
-#include <QtTest/QtTest>
-#include <QCoreApplication>
-#include <QTcpSocket>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QCoreApplication>
+#include "servers/mocktcpserver.h"
 
 using namespace nymeaserver;
 

tests/auto/states/teststates.cpp

@@ -21,16 +21,6 @@
 
 #include "nymeatestbase.h"
 #include "nymeacore.h"
-#include "devicemanager.h"
-#include "mocktcpserver.h"
-
-#include <QtTest/QtTest>
-#include <QCoreApplication>
-#include <QTcpSocket>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QCoreApplication>
 
 using namespace nymeaserver;
 

tests/auto/tags/testtags.cpp

@@ -19,17 +19,7 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "nymeatestbase.h"
-#include "nymeacore.h"
-#include "devicemanager.h"
-#include "mocktcpserver.h"
-
-#include <QtTest/QtTest>
-#include <QCoreApplication>
-#include <QTcpSocket>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QCoreApplication>
+#include "servers/mocktcpserver.h"
 
 using namespace nymeaserver;
 

tests/auto/timemanager/testtimemanager.cpp

@@ -21,18 +21,7 @@
 
 #include "nymeatestbase.h"
 #include "nymeacore.h"
-#include "time/timemanager.h"
-#include "devicemanager.h"
-#include "mocktcpserver.h"
-
-#include <QtTest/QtTest>
-#include <QCoreApplication>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QJsonDocument>
-#include <QTimeZone>
-#include <QDateTime>
+#include "servers/mocktcpserver.h"
 
 using namespace nymeaserver;
 

tests/auto/versioning/testversioning.cpp

@@ -19,16 +19,6 @@
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #include "nymeatestbase.h"
-#include "devicemanager.h"
-#include "mocktcpserver.h"
-
-#include <QtTest/QtTest>
-#include <QCoreApplication>
-#include <QTcpSocket>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QCoreApplication>
 
 using namespace nymeaserver;
 

tests/auto/webserver/testwebserver.cpp

@@ -20,20 +20,7 @@
 
 #include "nymeatestbase.h"
 #include "nymeacore.h"
-#include "devicemanager.h"
-#include "mocktcpserver.h"
-#include "rest/restresource.h"
-#include "webserver.h"
 
-#include <QtTest/QtTest>
-#include <QCoreApplication>
-#include <QTcpSocket>
-#include <QNetworkAccessManager>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QCoreApplication>
-#include <QMetaType>
-#include <QByteArray>
 #include <QXmlReader>
 
 using namespace nymeaserver;

tests/auto/websocketserver/testwebsocketserver.cpp

@@ -20,16 +20,6 @@
 
 #include "nymeatestbase.h"
 #include "nymeacore.h"
-#include "devicemanager.h"
-#include "mocktcpserver.h"
-#include "webserver.h"
-
-#include <QtTest/QtTest>
-#include <QCoreApplication>
-#include <QMetaType>
-#include <QByteArray>
-#include <QSignalSpy>
-#include <QJsonDocument>
 
 #include <QWebSocket>