From 34d68ab38a82d50f21f57e6e3f4cc0b1179460a9 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Tue, 30 Jan 2018 11:59:38 +0100 Subject: [PATCH] guhtestbase -> nymeatestbase --- libnymea-core/nymeacore.h | 2 +- tests/auto/actions/testactions.cpp | 4 +- tests/auto/autotests.pri | 4 +- .../configurations/testconfigurations.cpp | 4 +- tests/auto/devices/testdevices.cpp | 4 +- tests/auto/events/testevents.cpp | 4 +- tests/auto/jsonrpc/testjsonrpc.cpp | 4 +- tests/auto/logging/testlogging.cpp | 4 +- .../{guhtestbase.cpp => nymeatestbase.cpp} | 38 +++++++++---------- tests/auto/{guhtestbase.h => nymeatestbase.h} | 10 ++--- tests/auto/plugins/testplugins.cpp | 4 +- .../testrestdeviceclasses.cpp | 6 +-- tests/auto/restdevices/testrestdevices.cpp | 6 +-- tests/auto/restlogging/testrestlogging.cpp | 6 +-- tests/auto/restplugins/testrestplugins.cpp | 6 +-- tests/auto/restrules/testrestrules.cpp | 6 +-- tests/auto/restvendors/testrestvendors.cpp | 6 +-- tests/auto/rules/testrules.cpp | 4 +- tests/auto/states/teststates.cpp | 4 +- tests/auto/timemanager/testtimemanager.cpp | 4 +- tests/auto/versioning/testversioning.cpp | 4 +- tests/auto/webserver/testwebserver.cpp | 6 +-- .../websocketserver/testwebsocketserver.cpp | 6 +-- 23 files changed, 73 insertions(+), 73 deletions(-) rename tests/auto/{guhtestbase.cpp => nymeatestbase.cpp} (94%) rename tests/auto/{guhtestbase.h => nymeatestbase.h} (98%) diff --git a/libnymea-core/nymeacore.h b/libnymea-core/nymeacore.h index 95143e3d..85c6875e 100644 --- a/libnymea-core/nymeacore.h +++ b/libnymea-core/nymeacore.h @@ -53,7 +53,7 @@ class NymeaConfiguration; class NymeaCore : public QObject { Q_OBJECT - friend class GuhTestBase; + friend class NymeaTestBase; public: static NymeaCore* instance(); diff --git a/tests/auto/actions/testactions.cpp b/tests/auto/actions/testactions.cpp index b3e0d9e2..a9c38b78 100644 --- a/tests/auto/actions/testactions.cpp +++ b/tests/auto/actions/testactions.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "guhtestbase.h" +#include "nymeatestbase.h" #include "devicemanager.h" #include "mocktcpserver.h" @@ -33,7 +33,7 @@ using namespace guhserver; -class TestActions: public GuhTestBase +class TestActions: public NymeaTestBase { Q_OBJECT diff --git a/tests/auto/autotests.pri b/tests/auto/autotests.pri index 5b4140d8..dfe71ad4 100644 --- a/tests/auto/autotests.pri +++ b/tests/auto/autotests.pri @@ -10,9 +10,9 @@ LIBS += -L$$top_builddir/libnymea/ -lnymea \ -L$$top_builddir/plugins/mock/ \ -lssl -lcrypto -laws-iot-sdk-cpp -lavahi-common -lavahi-client -SOURCES += ../guhtestbase.cpp \ +SOURCES += ../nymeatestbase.cpp \ -HEADERS += ../guhtestbase.h \ +HEADERS += ../nymeatestbase.h \ target.path = /usr/tests INSTALLS += target diff --git a/tests/auto/configurations/testconfigurations.cpp b/tests/auto/configurations/testconfigurations.cpp index 995fb6ec..a30dd009 100644 --- a/tests/auto/configurations/testconfigurations.cpp +++ b/tests/auto/configurations/testconfigurations.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "guhtestbase.h" +#include "nymeatestbase.h" #include "devicemanager.h" #include "mocktcpserver.h" #include "nymeacore.h" @@ -34,7 +34,7 @@ using namespace guhserver; -class TestConfigurations: public GuhTestBase +class TestConfigurations: public NymeaTestBase { Q_OBJECT diff --git a/tests/auto/devices/testdevices.cpp b/tests/auto/devices/testdevices.cpp index 7510308e..2e0dd56f 100644 --- a/tests/auto/devices/testdevices.cpp +++ b/tests/auto/devices/testdevices.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "guhtestbase.h" +#include "nymeatestbase.h" #include "nymeacore.h" #include "devicemanager.h" #include "nymeasettings.h" @@ -33,7 +33,7 @@ using namespace guhserver; -class TestDevices : public GuhTestBase +class TestDevices : public NymeaTestBase { Q_OBJECT diff --git a/tests/auto/events/testevents.cpp b/tests/auto/events/testevents.cpp index 11cdc1fe..510d60b2 100644 --- a/tests/auto/events/testevents.cpp +++ b/tests/auto/events/testevents.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "guhtestbase.h" +#include "nymeatestbase.h" #include "nymeacore.h" #include "devicemanager.h" #include "mocktcpserver.h" @@ -34,7 +34,7 @@ using namespace guhserver; -class TestEvents: public GuhTestBase +class TestEvents: public NymeaTestBase { Q_OBJECT diff --git a/tests/auto/jsonrpc/testjsonrpc.cpp b/tests/auto/jsonrpc/testjsonrpc.cpp index 87b068ca..20db0e6e 100644 --- a/tests/auto/jsonrpc/testjsonrpc.cpp +++ b/tests/auto/jsonrpc/testjsonrpc.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "guhtestbase.h" +#include "nymeatestbase.h" #include "nymeacore.h" #include "devicemanager.h" #include "mocktcpserver.h" @@ -36,7 +36,7 @@ using namespace guhserver; -class TestJSONRPC: public GuhTestBase +class TestJSONRPC: public NymeaTestBase { Q_OBJECT diff --git a/tests/auto/logging/testlogging.cpp b/tests/auto/logging/testlogging.cpp index 992eba30..85cec700 100644 --- a/tests/auto/logging/testlogging.cpp +++ b/tests/auto/logging/testlogging.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "guhtestbase.h" +#include "nymeatestbase.h" #include "nymeacore.h" #include "devicemanager.h" #include "nymeasettings.h" @@ -35,7 +35,7 @@ using namespace guhserver; -class TestLogging : public GuhTestBase +class TestLogging : public NymeaTestBase { Q_OBJECT diff --git a/tests/auto/guhtestbase.cpp b/tests/auto/nymeatestbase.cpp similarity index 94% rename from tests/auto/guhtestbase.cpp rename to tests/auto/nymeatestbase.cpp index ac55e1fe..89209a40 100644 --- a/tests/auto/guhtestbase.cpp +++ b/tests/auto/nymeatestbase.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "guhtestbase.h" +#include "nymeatestbase.h" #include "mocktcpserver.h" #include "nymeacore.h" #include "nymeasettings.h" @@ -111,7 +111,7 @@ static void loggingCategoryFilter(QLoggingCategory *category) } } -GuhTestBase::GuhTestBase(QObject *parent) : +NymeaTestBase::NymeaTestBase(QObject *parent) : QObject(parent), m_commandId(0) { @@ -124,9 +124,9 @@ GuhTestBase::GuhTestBase(QObject *parent) : QCoreApplication::instance()->setOrganizationName("nymea-test"); } -void GuhTestBase::initTestCase() +void NymeaTestBase::initTestCase() { - qDebug() << "GuhTestBase starting."; + qDebug() << "NymeaTestBase starting."; // If testcase asserts cleanup won't do. Lets clear any previous test run settings leftovers qDebug() << "Reset test settings"; @@ -214,12 +214,12 @@ void GuhTestBase::initTestCase() } } -void GuhTestBase::cleanupTestCase() +void NymeaTestBase::cleanupTestCase() { NymeaCore::instance()->destroy(); } -void GuhTestBase::cleanup() +void NymeaTestBase::cleanup() { // In case a test deleted the mock device, lets recreate it. if (NymeaCore::instance()->deviceManager()->findConfiguredDevices(mockDeviceClassId).count() == 0) { @@ -227,7 +227,7 @@ void GuhTestBase::cleanup() } } -QVariant GuhTestBase::injectAndWait(const QString &method, const QVariantMap ¶ms, const QUuid &clientId) +QVariant NymeaTestBase::injectAndWait(const QString &method, const QVariantMap ¶ms, const QUuid &clientId) { QVariantMap call; call.insert("id", m_commandId); @@ -267,7 +267,7 @@ QVariant GuhTestBase::injectAndWait(const QString &method, const QVariantMap &pa return QVariant(); } -QVariant GuhTestBase::checkNotification(const QSignalSpy &spy, const QString ¬ification) +QVariant NymeaTestBase::checkNotification(const QSignalSpy &spy, const QString ¬ification) { //qDebug() << "Got" << spy.count() << "notifications while waiting for" << notification; for (int i = 0; i < spy.count(); i++) { @@ -287,7 +287,7 @@ QVariant GuhTestBase::checkNotification(const QSignalSpy &spy, const QString &no return QVariant(); } -QVariantList GuhTestBase::checkNotifications(const QSignalSpy &spy, const QString ¬ification) +QVariantList NymeaTestBase::checkNotifications(const QSignalSpy &spy, const QString ¬ification) { //qDebug() << "Got" << spy.count() << "notifications while waiting for" << notification; QVariantList notificationList; @@ -308,7 +308,7 @@ QVariantList GuhTestBase::checkNotifications(const QSignalSpy &spy, const QStrin return notificationList; } -QVariant GuhTestBase::getAndWait(const QNetworkRequest &request, const int &expectedStatus) +QVariant NymeaTestBase::getAndWait(const QNetworkRequest &request, const int &expectedStatus) { QNetworkAccessManager nam; connect(&nam, &QNetworkAccessManager::sslErrors, [this, &nam](QNetworkReply *reply, const QList &) { @@ -344,7 +344,7 @@ QVariant GuhTestBase::getAndWait(const QNetworkRequest &request, const int &expe return jsonDoc.toVariant(); } -QVariant GuhTestBase::deleteAndWait(const QNetworkRequest &request, const int &expectedStatus) +QVariant NymeaTestBase::deleteAndWait(const QNetworkRequest &request, const int &expectedStatus) { QNetworkAccessManager nam; connect(&nam, &QNetworkAccessManager::sslErrors, [this, &nam](QNetworkReply *reply, const QList &) { @@ -379,7 +379,7 @@ QVariant GuhTestBase::deleteAndWait(const QNetworkRequest &request, const int &e return jsonDoc.toVariant(); } -QVariant GuhTestBase::postAndWait(const QNetworkRequest &request, const QVariant ¶ms, const int &expectedStatus) +QVariant NymeaTestBase::postAndWait(const QNetworkRequest &request, const QVariant ¶ms, const int &expectedStatus) { QNetworkAccessManager nam; connect(&nam, &QNetworkAccessManager::sslErrors, [this, &nam](QNetworkReply *reply, const QList &) { @@ -419,7 +419,7 @@ QVariant GuhTestBase::postAndWait(const QNetworkRequest &request, const QVariant } -QVariant GuhTestBase::putAndWait(const QNetworkRequest &request, const QVariant ¶ms, const int &expectedStatus) +QVariant NymeaTestBase::putAndWait(const QNetworkRequest &request, const QVariant ¶ms, const int &expectedStatus) { QNetworkAccessManager nam; connect(&nam, &QNetworkAccessManager::sslErrors, [this, &nam](QNetworkReply *reply, const QList &) { @@ -456,7 +456,7 @@ QVariant GuhTestBase::putAndWait(const QNetworkRequest &request, const QVariant return jsonDoc.toVariant(); } -void GuhTestBase::verifyReply(QNetworkReply *reply, const QByteArray &data, const int &expectedStatus) +void NymeaTestBase::verifyReply(QNetworkReply *reply, const QByteArray &data, const int &expectedStatus) { int statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); QCOMPARE(statusCode, expectedStatus); @@ -470,7 +470,7 @@ void GuhTestBase::verifyReply(QNetworkReply *reply, const QByteArray &data, cons // } } -bool GuhTestBase::enableNotifications() +bool NymeaTestBase::enableNotifications() { QVariantMap notificationParams; notificationParams.insert("enabled", true); @@ -482,7 +482,7 @@ bool GuhTestBase::enableNotifications() return true; } -bool GuhTestBase::disableNotifications() +bool NymeaTestBase::disableNotifications() { QVariantMap notificationParams; notificationParams.insert("enabled", false); @@ -494,7 +494,7 @@ bool GuhTestBase::disableNotifications() return true; } -void GuhTestBase::restartServer() +void NymeaTestBase::restartServer() { // Destroy and recreate the core instance... NymeaCore::instance()->destroy(); @@ -506,12 +506,12 @@ void GuhTestBase::restartServer() m_mockTcpServer->clientConnected(m_clientId); } -void GuhTestBase::clearLoggingDatabase() +void NymeaTestBase::clearLoggingDatabase() { NymeaCore::instance()->logEngine()->clearDatabase(); } -void GuhTestBase::createMockDevice() +void NymeaTestBase::createMockDevice() { QVariantMap params; params.insert("name", "Test Mock Device"); diff --git a/tests/auto/guhtestbase.h b/tests/auto/nymeatestbase.h similarity index 98% rename from tests/auto/guhtestbase.h rename to tests/auto/nymeatestbase.h index 83aea48a..15f5ceab 100644 --- a/tests/auto/guhtestbase.h +++ b/tests/auto/nymeatestbase.h @@ -19,8 +19,8 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#ifndef GUHTESTBASE_H -#define GUHTESTBASE_H +#ifndef NYMEATESTBASE_H +#define NYMEATESTBASE_H #include "typeutils.h" #include "logging/logging.h" @@ -96,11 +96,11 @@ using namespace guhserver; class MockTcpServer; -class GuhTestBase : public QObject +class NymeaTestBase : public QObject { Q_OBJECT public: - explicit GuhTestBase(QObject *parent = 0); + explicit NymeaTestBase(QObject *parent = 0); protected slots: void initTestCase(); @@ -201,4 +201,4 @@ protected: }; -#endif // GUHTESTBASE_H +#endif // NYMEATESTBASE_H diff --git a/tests/auto/plugins/testplugins.cpp b/tests/auto/plugins/testplugins.cpp index 1fb90ebd..c92762e4 100644 --- a/tests/auto/plugins/testplugins.cpp +++ b/tests/auto/plugins/testplugins.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "guhtestbase.h" +#include "nymeatestbase.h" #include "devicemanager.h" #include "mocktcpserver.h" @@ -33,7 +33,7 @@ using namespace guhserver; -class TestPlugins: public GuhTestBase +class TestPlugins: public NymeaTestBase { Q_OBJECT diff --git a/tests/auto/restdeviceclasses/testrestdeviceclasses.cpp b/tests/auto/restdeviceclasses/testrestdeviceclasses.cpp index e3e10a9a..40d6ecaa 100644 --- a/tests/auto/restdeviceclasses/testrestdeviceclasses.cpp +++ b/tests/auto/restdeviceclasses/testrestdeviceclasses.cpp @@ -18,7 +18,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "guhtestbase.h" +#include "nymeatestbase.h" #include "nymeacore.h" #include "devicemanager.h" #include "mocktcpserver.h" @@ -37,7 +37,7 @@ using namespace guhserver; -class TestRestDeviceClasses: public GuhTestBase +class TestRestDeviceClasses: public NymeaTestBase { Q_OBJECT @@ -66,7 +66,7 @@ private slots: void TestRestDeviceClasses::initTestCase() { - GuhTestBase::initTestCase(); + NymeaTestBase::initTestCase(); foreach (const WebServerConfiguration &config, NymeaCore::instance()->configuration()->webServerConfigurations()) { if (config.port == 3333 && (config.address == QHostAddress("127.0.0.1") || config.address == QHostAddress("0.0.0.0"))) { diff --git a/tests/auto/restdevices/testrestdevices.cpp b/tests/auto/restdevices/testrestdevices.cpp index 4373e64d..1f7ece13 100644 --- a/tests/auto/restdevices/testrestdevices.cpp +++ b/tests/auto/restdevices/testrestdevices.cpp @@ -18,7 +18,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "guhtestbase.h" +#include "nymeatestbase.h" #include "nymeacore.h" #include "devicemanager.h" #include "mocktcpserver.h" @@ -37,7 +37,7 @@ using namespace guhserver; -class TestRestDevices: public GuhTestBase +class TestRestDevices: public NymeaTestBase { Q_OBJECT @@ -76,7 +76,7 @@ private slots: void TestRestDevices::initTestCase() { - GuhTestBase::initTestCase(); + NymeaTestBase::initTestCase(); foreach (const WebServerConfiguration &config, NymeaCore::instance()->configuration()->webServerConfigurations()) { if (config.port == 3333 && (config.address == QHostAddress("127.0.0.1") || config.address == QHostAddress("0.0.0.0"))) { qDebug() << "Already have a webserver listening on 127.0.0.1:3333"; diff --git a/tests/auto/restlogging/testrestlogging.cpp b/tests/auto/restlogging/testrestlogging.cpp index 59234fe6..59741add 100644 --- a/tests/auto/restlogging/testrestlogging.cpp +++ b/tests/auto/restlogging/testrestlogging.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "guhtestbase.h" +#include "nymeatestbase.h" #include "nymeacore.h" #include "devicemanager.h" #include "plugin/deviceplugin.h" @@ -32,7 +32,7 @@ using namespace guhserver; -class TestRestLogging : public GuhTestBase +class TestRestLogging : public NymeaTestBase { Q_OBJECT @@ -58,7 +58,7 @@ private slots: void TestRestLogging::initTestCase() { - GuhTestBase::initTestCase(); + NymeaTestBase::initTestCase(); foreach (const WebServerConfiguration &config, NymeaCore::instance()->configuration()->webServerConfigurations()) { if (config.port == 3333 && (config.address == QHostAddress("127.0.0.1") || config.address == QHostAddress("0.0.0.0"))) { diff --git a/tests/auto/restplugins/testrestplugins.cpp b/tests/auto/restplugins/testrestplugins.cpp index 9303867f..c4ca782e 100644 --- a/tests/auto/restplugins/testrestplugins.cpp +++ b/tests/auto/restplugins/testrestplugins.cpp @@ -18,7 +18,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "guhtestbase.h" +#include "nymeatestbase.h" #include "nymeacore.h" #include "devicemanager.h" #include "mocktcpserver.h" @@ -37,7 +37,7 @@ using namespace guhserver; -class TestRestPlugins: public GuhTestBase +class TestRestPlugins: public NymeaTestBase { Q_OBJECT @@ -59,7 +59,7 @@ private slots: void TestRestPlugins::initTestCase() { - GuhTestBase::initTestCase(); + NymeaTestBase::initTestCase(); foreach (const WebServerConfiguration &config, NymeaCore::instance()->configuration()->webServerConfigurations()) { if (config.port == 3333 && (config.address == QHostAddress("127.0.0.1") || config.address == QHostAddress("0.0.0.0"))) { diff --git a/tests/auto/restrules/testrestrules.cpp b/tests/auto/restrules/testrestrules.cpp index c9371d35..938caf23 100644 --- a/tests/auto/restrules/testrestrules.cpp +++ b/tests/auto/restrules/testrestrules.cpp @@ -18,7 +18,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "guhtestbase.h" +#include "nymeatestbase.h" #include "nymeacore.h" #include "devicemanager.h" #include "mocktcpserver.h" @@ -37,7 +37,7 @@ using namespace guhserver; -class TestRestRules: public GuhTestBase +class TestRestRules: public NymeaTestBase { Q_OBJECT @@ -80,7 +80,7 @@ private slots: void TestRestRules::initTestCase() { - GuhTestBase::initTestCase(); + NymeaTestBase::initTestCase(); foreach (const WebServerConfiguration &config, NymeaCore::instance()->configuration()->webServerConfigurations()) { if (config.port == 3333 && (config.address == QHostAddress("127.0.0.1") || config.address == QHostAddress("0.0.0.0"))) { diff --git a/tests/auto/restvendors/testrestvendors.cpp b/tests/auto/restvendors/testrestvendors.cpp index 79c418d4..dc42aea5 100644 --- a/tests/auto/restvendors/testrestvendors.cpp +++ b/tests/auto/restvendors/testrestvendors.cpp @@ -18,7 +18,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "guhtestbase.h" +#include "nymeatestbase.h" #include "nymeacore.h" #include "devicemanager.h" #include "mocktcpserver.h" @@ -37,7 +37,7 @@ using namespace guhserver; -class TestRestVendors: public GuhTestBase +class TestRestVendors: public NymeaTestBase { Q_OBJECT @@ -54,7 +54,7 @@ private slots: void TestRestVendors::initTestCase() { - GuhTestBase::initTestCase(); + NymeaTestBase::initTestCase(); foreach (const WebServerConfiguration &config, NymeaCore::instance()->configuration()->webServerConfigurations()) { if (config.port == 3333 && (config.address == QHostAddress("127.0.0.1") || config.address == QHostAddress("0.0.0.0"))) { diff --git a/tests/auto/rules/testrules.cpp b/tests/auto/rules/testrules.cpp index ed76fc1e..34097dca 100644 --- a/tests/auto/rules/testrules.cpp +++ b/tests/auto/rules/testrules.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "guhtestbase.h" +#include "nymeatestbase.h" #include "devicemanager.h" #include "nymeasettings.h" #include "mocktcpserver.h" @@ -34,7 +34,7 @@ using namespace guhserver; -class TestRules: public GuhTestBase +class TestRules: public NymeaTestBase { Q_OBJECT diff --git a/tests/auto/states/teststates.cpp b/tests/auto/states/teststates.cpp index 93687cd5..8eee8aac 100644 --- a/tests/auto/states/teststates.cpp +++ b/tests/auto/states/teststates.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "guhtestbase.h" +#include "nymeatestbase.h" #include "nymeacore.h" #include "devicemanager.h" #include "mocktcpserver.h" @@ -34,7 +34,7 @@ using namespace guhserver; -class TestStates: public GuhTestBase +class TestStates: public NymeaTestBase { Q_OBJECT diff --git a/tests/auto/timemanager/testtimemanager.cpp b/tests/auto/timemanager/testtimemanager.cpp index c49f578b..514f51db 100644 --- a/tests/auto/timemanager/testtimemanager.cpp +++ b/tests/auto/timemanager/testtimemanager.cpp @@ -19,7 +19,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "guhtestbase.h" +#include "nymeatestbase.h" #include "nymeacore.h" #include "time/timemanager.h" #include "devicemanager.h" @@ -36,7 +36,7 @@ using namespace guhserver; -class TestTimeManager: public GuhTestBase +class TestTimeManager: public NymeaTestBase { Q_OBJECT diff --git a/tests/auto/versioning/testversioning.cpp b/tests/auto/versioning/testversioning.cpp index ccf2e8b4..d3cde252 100644 --- a/tests/auto/versioning/testversioning.cpp +++ b/tests/auto/versioning/testversioning.cpp @@ -18,7 +18,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "guhtestbase.h" +#include "nymeatestbase.h" #include "devicemanager.h" #include "mocktcpserver.h" @@ -32,7 +32,7 @@ using namespace guhserver; -class TestVersioning: public GuhTestBase +class TestVersioning: public NymeaTestBase { Q_OBJECT diff --git a/tests/auto/webserver/testwebserver.cpp b/tests/auto/webserver/testwebserver.cpp index abc46cc4..378b91da 100644 --- a/tests/auto/webserver/testwebserver.cpp +++ b/tests/auto/webserver/testwebserver.cpp @@ -18,7 +18,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "guhtestbase.h" +#include "nymeatestbase.h" #include "nymeacore.h" #include "devicemanager.h" #include "mocktcpserver.h" @@ -38,7 +38,7 @@ using namespace guhserver; -class TestWebserver: public GuhTestBase +class TestWebserver: public NymeaTestBase { Q_OBJECT @@ -81,7 +81,7 @@ public slots: void TestWebserver::initTestCase() { - GuhTestBase::initTestCase(); + NymeaTestBase::initTestCase(); qDebug() << "TestWebserver starting"; foreach (const WebServerConfiguration &config, NymeaCore::instance()->configuration()->webServerConfigurations()) { diff --git a/tests/auto/websocketserver/testwebsocketserver.cpp b/tests/auto/websocketserver/testwebsocketserver.cpp index 2296cebe..b489582f 100644 --- a/tests/auto/websocketserver/testwebsocketserver.cpp +++ b/tests/auto/websocketserver/testwebsocketserver.cpp @@ -18,7 +18,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "guhtestbase.h" +#include "nymeatestbase.h" #include "nymeacore.h" #include "devicemanager.h" #include "mocktcpserver.h" @@ -35,7 +35,7 @@ using namespace guhserver; -class TestWebSocketServer: public GuhTestBase +class TestWebSocketServer: public NymeaTestBase { Q_OBJECT @@ -67,7 +67,7 @@ private: void TestWebSocketServer::initTestCase() { - GuhTestBase::initTestCase(); + NymeaTestBase::initTestCase(); ServerConfiguration config; foreach (const ServerConfiguration &c, NymeaCore::instance()->configuration()->webSocketServerConfigurations()) {