From 5c89a04b7426d695f054467c93b97856da78c1d0 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Tue, 8 Aug 2017 23:47:31 +0200 Subject: [PATCH] update all rest tests to use SSL --- tests/auto/guhtestbase.cpp | 13 +++ .../testrestdeviceclasses.cpp | 27 ++++--- tests/auto/restdevices/testrestdevices.cpp | 66 ++++++++-------- tests/auto/restlogging/testrestlogging.cpp | 12 +-- tests/auto/restplugins/testrestplugins.cpp | 26 +++--- tests/auto/restrules/testrestrules.cpp | 79 +++++++++++-------- tests/auto/restvendors/testrestvendors.cpp | 16 ++-- 7 files changed, 138 insertions(+), 101 deletions(-) diff --git a/tests/auto/guhtestbase.cpp b/tests/auto/guhtestbase.cpp index bac17775..afacae93 100644 --- a/tests/auto/guhtestbase.cpp +++ b/tests/auto/guhtestbase.cpp @@ -290,6 +290,9 @@ QVariantList GuhTestBase::checkNotifications(const QSignalSpy &spy, const QStrin QVariant GuhTestBase::getAndWait(const QNetworkRequest &request, const int &expectedStatus) { QNetworkAccessManager nam; + connect(&nam, &QNetworkAccessManager::sslErrors, [this, &nam](QNetworkReply *reply, const QList &) { + reply->ignoreSslErrors(); + }); QSignalSpy clientSpy(&nam, SIGNAL(finished(QNetworkReply*))); QNetworkReply *reply = nam.get(request); @@ -305,6 +308,7 @@ QVariant GuhTestBase::getAndWait(const QNetworkRequest &request, const int &expe } QByteArray data = reply->readAll(); + qDebug() << "***************reply" << reply->errorString() << reply->request().url(); verifyReply(reply, data, expectedStatus); reply->deleteLater(); @@ -322,6 +326,9 @@ QVariant GuhTestBase::getAndWait(const QNetworkRequest &request, const int &expe QVariant GuhTestBase::deleteAndWait(const QNetworkRequest &request, const int &expectedStatus) { QNetworkAccessManager nam; + connect(&nam, &QNetworkAccessManager::sslErrors, [this, &nam](QNetworkReply *reply, const QList &) { + reply->ignoreSslErrors(); + }); QSignalSpy clientSpy(&nam, SIGNAL(finished(QNetworkReply*))); QNetworkReply *reply = nam.deleteResource(request); @@ -354,6 +361,9 @@ QVariant GuhTestBase::deleteAndWait(const QNetworkRequest &request, const int &e QVariant GuhTestBase::postAndWait(const QNetworkRequest &request, const QVariant ¶ms, const int &expectedStatus) { QNetworkAccessManager nam; + connect(&nam, &QNetworkAccessManager::sslErrors, [this, &nam](QNetworkReply *reply, const QList &) { + reply->ignoreSslErrors(); + }); QSignalSpy clientSpy(&nam, SIGNAL(finished(QNetworkReply*))); QByteArray payload = QJsonDocument::fromVariant(params).toJson(QJsonDocument::Compact); @@ -391,6 +401,9 @@ QVariant GuhTestBase::postAndWait(const QNetworkRequest &request, const QVariant QVariant GuhTestBase::putAndWait(const QNetworkRequest &request, const QVariant ¶ms, const int &expectedStatus) { QNetworkAccessManager nam; + connect(&nam, &QNetworkAccessManager::sslErrors, [this, &nam](QNetworkReply *reply, const QList &) { + reply->ignoreSslErrors(); + }); QSignalSpy clientSpy(&nam, SIGNAL(finished(QNetworkReply*))); QByteArray payload = QJsonDocument::fromVariant(params).toJson(QJsonDocument::Compact); diff --git a/tests/auto/restdeviceclasses/testrestdeviceclasses.cpp b/tests/auto/restdeviceclasses/testrestdeviceclasses.cpp index 09dc2699..cb51b17d 100644 --- a/tests/auto/restdeviceclasses/testrestdeviceclasses.cpp +++ b/tests/auto/restdeviceclasses/testrestdeviceclasses.cpp @@ -65,7 +65,7 @@ private slots: void TestRestDeviceClasses::getSupportedDevices() { // Get all deviceclasses - QUrl url("http://localhost:3333/api/v1/deviceclasses"); + QUrl url("https://localhost:3333/api/v1/deviceclasses"); QVariant response = getAndWait(QNetworkRequest(url)); QVariantList deviceClassesList = response.toList(); QVERIFY2(deviceClassesList.count() > 0, "Not enought deviceclasses."); @@ -75,7 +75,7 @@ void TestRestDeviceClasses::getSupportedDevices() QVariantMap deviceClassMap = deviceClass.toMap(); QNetworkRequest request; request.setHeader(QNetworkRequest::ContentTypeHeader, "text/json"); - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/deviceclasses/%1").arg(deviceClassMap.value("id").toString()))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/deviceclasses/%1").arg(deviceClassMap.value("id").toString()))); response = getAndWait(request); QVERIFY2(!response.isNull(), "Could not get device"); @@ -102,10 +102,13 @@ void TestRestDeviceClasses::getSupportedDevices() void TestRestDeviceClasses::invalidMethod() { QNetworkAccessManager nam; + connect(&nam, &QNetworkAccessManager::sslErrors, [this, &nam](QNetworkReply *reply, const QList &) { + reply->ignoreSslErrors(); + }); QSignalSpy clientSpy(&nam, SIGNAL(finished(QNetworkReply*))); QNetworkRequest request; - request.setUrl(QUrl("http://localhost:3333/api/v1/deviceclasses/")); + request.setUrl(QUrl("https://localhost:3333/api/v1/deviceclasses/")); QNetworkReply *reply = nam.post(request, QByteArray()); clientSpy.wait(); @@ -147,10 +150,10 @@ void TestRestDeviceClasses::getActionTypes() QNetworkRequest request; if (!actionTypeId.isEmpty()) { - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/deviceclasses/%1/actiontypes/%2").arg(deviceClassId).arg(actionTypeId))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/deviceclasses/%1/actiontypes/%2").arg(deviceClassId).arg(actionTypeId))); } else { // Get all actiontypes - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/deviceclasses/%1/actiontypes").arg(deviceClassId))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/deviceclasses/%1/actiontypes").arg(deviceClassId))); } QVariant response = getAndWait(request, expectedStatusCode); @@ -185,10 +188,10 @@ void TestRestDeviceClasses::getStateTypes() QNetworkRequest request; if (!stateTypeId.isEmpty()) { - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/deviceclasses/%1/statetypes/%2").arg(deviceClassId).arg(stateTypeId))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/deviceclasses/%1/statetypes/%2").arg(deviceClassId).arg(stateTypeId))); } else { // Get all actiontypes - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/deviceclasses/%1/statetypes").arg(deviceClassId))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/deviceclasses/%1/statetypes").arg(deviceClassId))); } QVariant response = getAndWait(request, expectedStatusCode); @@ -223,10 +226,10 @@ void TestRestDeviceClasses::getEventTypes() QNetworkRequest request; if (!eventTypeId.isNull()) { - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/deviceclasses/%1/eventtypes/%2").arg(deviceClassId).arg(eventTypeId))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/deviceclasses/%1/eventtypes/%2").arg(deviceClassId).arg(eventTypeId))); } else { // Get all actiontypes - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/deviceclasses/%1/eventtypes").arg(deviceClassId))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/deviceclasses/%1/eventtypes").arg(deviceClassId))); } QVariant response = getAndWait(request, expectedStatusCode); @@ -277,7 +280,7 @@ void TestRestDeviceClasses::discoverDevices() params.insert("discoveryParams", discoveryParams); // DISCOVER - QUrl url(QString("http://localhost:3333/api/v1/deviceclasses/%1/discover").arg(deviceClassId.toString())); + QUrl url(QString("https://localhost:3333/api/v1/deviceclasses/%1/discover").arg(deviceClassId.toString())); if (!discoveryParams.isEmpty()) { QUrlQuery query; query.addQueryItem("params", QJsonDocument::fromVariant(discoveryParams).toJson(QJsonDocument::Compact)); @@ -297,7 +300,7 @@ void TestRestDeviceClasses::discoverDevices() QCOMPARE(foundDevices.count(), resultCount); // ADD the discovered device - QNetworkRequest request(QUrl("http://localhost:3333/api/v1/devices")); + QNetworkRequest request(QUrl("https://localhost:3333/api/v1/devices")); request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); DeviceDescriptorId descriptorId = DeviceDescriptorId(foundDevices.first().toMap().value("id").toString()); @@ -312,7 +315,7 @@ void TestRestDeviceClasses::discoverDevices() QVERIFY2(!deviceId.isNull(), "got invalid device id"); // REMOVE added device - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/devices/%1").arg(deviceId.toString()))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/devices/%1").arg(deviceId.toString()))); response = deleteAndWait(request); QVERIFY2(!response.isNull(), "Could not delete device"); } diff --git a/tests/auto/restdevices/testrestdevices.cpp b/tests/auto/restdevices/testrestdevices.cpp index aed13c9a..973620c7 100644 --- a/tests/auto/restdevices/testrestdevices.cpp +++ b/tests/auto/restdevices/testrestdevices.cpp @@ -75,15 +75,15 @@ private slots: void TestRestDevices::getConfiguredDevices() { // Get all devices - QVariant response = getAndWait(QNetworkRequest(QUrl("http://localhost:3333/api/v1/devices"))); + QVariant response = getAndWait(QNetworkRequest(QUrl("https://localhost:3333/api/v1/devices"))); QVERIFY2(!response.isNull(), "Could not get device"); QVariantList deviceList = response.toList(); QVERIFY2(deviceList.count() >= 2, "not enought devices."); - // Get each of thouse devices individualy + // Get each of those devices individualy foreach (const QVariant &device, deviceList) { QVariantMap deviceMap = device.toMap(); - QNetworkRequest request(QUrl(QString("http://localhost:3333/api/v1/devices/%1").arg(deviceMap.value("id").toString()))); + QNetworkRequest request(QUrl(QString("https://localhost:3333/api/v1/devices/%1").arg(deviceMap.value("id").toString()))); response = getAndWait(request); QVERIFY2(!response.isNull(), "Could not get device"); } @@ -152,7 +152,7 @@ void TestRestDevices::addConfiguredDevice() params.insert("name", "Mock device"); params.insert("deviceParams", deviceParams); - QNetworkRequest request(QUrl("http://localhost:3333/api/v1/devices")); + QNetworkRequest request(QUrl("https://localhost:3333/api/v1/devices")); request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); QVariant response = postAndWait(request, params, expectedStatusCode); @@ -165,7 +165,7 @@ void TestRestDevices::addConfiguredDevice() DeviceId deviceId = DeviceId(response.toMap().value("id").toString()); QVERIFY2(!deviceId.isNull(), "invalid device id for removing"); - QNetworkRequest deleteRequest(QUrl(QString("http://localhost:3333/api/v1/devices/%1").arg(deviceId.toString()))); + QNetworkRequest deleteRequest(QUrl(QString("https://localhost:3333/api/v1/devices/%1").arg(deviceId.toString()))); response = deleteAndWait(deleteRequest); QVERIFY2(!response.isNull(), "Could not delete device"); } @@ -200,7 +200,7 @@ void TestRestDevices::addPushButtonDevices() params.insert("discoveryParams", discoveryParams); // create URL - QUrl url(QString("http://localhost:3333/api/v1/deviceclasses/%1/discover").arg(deviceClassId.toString())); + QUrl url(QString("https://localhost:3333/api/v1/deviceclasses/%1/discover").arg(deviceClassId.toString())); QUrlQuery query; query.addQueryItem("params", QJsonDocument::fromVariant(discoveryParams).toJson(QJsonDocument::Compact)); url.setQuery(query); @@ -217,7 +217,7 @@ void TestRestDevices::addPushButtonDevices() params.insert("name", "Push button mock device"); params.insert("deviceDescriptorId", deviceDescriptoId); - QNetworkRequest pairRequest(QUrl("http://localhost:3333/api/v1/devices/pair")); + QNetworkRequest pairRequest(QUrl("https://localhost:3333/api/v1/devices/pair")); pairRequest.setHeader(QNetworkRequest::ContentTypeHeader, "text/json"); response = postAndWait(pairRequest, params); @@ -235,7 +235,7 @@ void TestRestDevices::addPushButtonDevices() params.clear(); params.insert("pairingTransactionId", pairingTransactionId.toString()); - QNetworkRequest confirmPairingRequest(QUrl("http://localhost:3333/api/v1/devices/confirmpairing")); + QNetworkRequest confirmPairingRequest(QUrl("https://localhost:3333/api/v1/devices/confirmpairing")); confirmPairingRequest.setHeader(QNetworkRequest::ContentTypeHeader, "text/json"); response = postAndWait(confirmPairingRequest, params, expectedStatusCode); @@ -246,7 +246,7 @@ void TestRestDevices::addPushButtonDevices() DeviceId deviceId = DeviceId(response.toMap().value("id").toString()); QVERIFY2(!deviceId.isNull(), "invalid device id for removing"); - QNetworkRequest deleteRequest(QUrl(QString("http://localhost:3333/api/v1/devices/%1").arg(deviceId.toString()))); + QNetworkRequest deleteRequest(QUrl(QString("https://localhost:3333/api/v1/devices/%1").arg(deviceId.toString()))); response = deleteAndWait(deleteRequest); QVERIFY2(!response.isNull(), "Could not delete device"); } @@ -281,7 +281,7 @@ void TestRestDevices::addDisplayPinDevices() params.insert("discoveryParams", discoveryParams); // create URL - QUrl url(QString("http://localhost:3333/api/v1/deviceclasses/%1/discover").arg(deviceClassId.toString())); + QUrl url(QString("https://localhost:3333/api/v1/deviceclasses/%1/discover").arg(deviceClassId.toString())); QUrlQuery query; query.addQueryItem("params", QJsonDocument::fromVariant(discoveryParams).toJson(QJsonDocument::Compact)); url.setQuery(query); @@ -298,7 +298,7 @@ void TestRestDevices::addDisplayPinDevices() params.insert("name", "Display pin mock device"); params.insert("deviceDescriptorId", deviceDescriptoId); - QNetworkRequest pairRequest(QUrl("http://localhost:3333/api/v1/devices/pair")); + QNetworkRequest pairRequest(QUrl("https://localhost:3333/api/v1/devices/pair")); pairRequest.setHeader(QNetworkRequest::ContentTypeHeader, "text/json"); response = postAndWait(pairRequest, params); @@ -314,7 +314,7 @@ void TestRestDevices::addDisplayPinDevices() params.insert("pairingTransactionId", pairingTransactionId.toString()); params.insert("secret", secret); - QNetworkRequest confirmPairingRequest(QUrl("http://localhost:3333/api/v1/devices/confirmpairing")); + QNetworkRequest confirmPairingRequest(QUrl("https://localhost:3333/api/v1/devices/confirmpairing")); confirmPairingRequest.setHeader(QNetworkRequest::ContentTypeHeader, "text/json"); response = postAndWait(confirmPairingRequest, params, expectedStatusCode); @@ -325,7 +325,7 @@ void TestRestDevices::addDisplayPinDevices() DeviceId deviceId = DeviceId(response.toMap().value("id").toString()); QVERIFY2(!deviceId.isNull(), "invalid device id for removing"); - QNetworkRequest deleteRequest(QUrl(QString("http://localhost:3333/api/v1/devices/%1").arg(deviceId.toString()))); + QNetworkRequest deleteRequest(QUrl(QString("https://localhost:3333/api/v1/devices/%1").arg(deviceId.toString()))); response = deleteAndWait(deleteRequest); QVERIFY2(!response.isNull(), "Could not delete device"); } @@ -337,7 +337,7 @@ void TestRestDevices::parentChildDevices() QVariantMap params; params.insert("deviceClassId", mockParentDeviceClassId); - QNetworkRequest request(QUrl(QString("http://localhost:3333/api/v1/devices"))); + QNetworkRequest request(QUrl(QString("https://localhost:3333/api/v1/devices"))); request.setHeader(QNetworkRequest::ContentTypeHeader, "text/json"); QVariant response = postAndWait(request, params); QVERIFY2(!response.isNull(), "Could not read add device response"); @@ -346,7 +346,7 @@ void TestRestDevices::parentChildDevices() QVERIFY2(parentDeviceId != DeviceId(), "DeviceId not returned"); // find child device - response = getAndWait(QNetworkRequest(QUrl("http://localhost:3333/api/v1/devices"))); + response = getAndWait(QNetworkRequest(QUrl("https://localhost:3333/api/v1/devices"))); QVariantList deviceList = response.toList(); DeviceId childDeviceId; foreach (const QVariant deviceVariant, deviceList) { @@ -360,13 +360,13 @@ void TestRestDevices::parentChildDevices() QVERIFY2(!childDeviceId.isNull(), "Could not find child device"); // try to remove child device - QNetworkRequest deleteRequest(QUrl(QString("http://localhost:3333/api/v1/devices/%1").arg(childDeviceId.toString()))); + QNetworkRequest deleteRequest(QUrl(QString("https://localhost:3333/api/v1/devices/%1").arg(childDeviceId.toString()))); response = deleteAndWait(deleteRequest, 400); //QVERIFY2(!response.isNull(), "Could not delete device"); QCOMPARE(JsonTypes::deviceErrorToString(DeviceManager::DeviceErrorDeviceIsChild), response.toMap().value("error").toString()); // check if the child device is still there - response = getAndWait(QNetworkRequest(QUrl("http://localhost:3333/api/v1/devices"))); + response = getAndWait(QNetworkRequest(QUrl("https://localhost:3333/api/v1/devices"))); deviceList = response.toList(); bool found = false; foreach (const QVariant deviceVariant, deviceList) { @@ -381,12 +381,12 @@ void TestRestDevices::parentChildDevices() QVERIFY2(found, "Could not find child device."); // remove the parent device - deleteRequest.setUrl(QUrl(QString("http://localhost:3333/api/v1/devices/%1").arg(parentDeviceId.toString()))); + deleteRequest.setUrl(QUrl(QString("https://localhost:3333/api/v1/devices/%1").arg(parentDeviceId.toString()))); response = deleteAndWait(deleteRequest); QVERIFY2(!response.isNull(), "Could not delete device"); // check if the child device is still there - response = getAndWait(QNetworkRequest(QUrl("http://localhost:3333/api/v1/devices"))); + response = getAndWait(QNetworkRequest(QUrl("https://localhost:3333/api/v1/devices"))); deviceList = response.toList(); found = false; foreach (const QVariant deviceVariant, deviceList) { @@ -440,7 +440,7 @@ void TestRestDevices::executeAction() QVariantMap params; params.insert("params", actionParams); - QNetworkRequest request(QUrl(QString("http://localhost:3333/api/v1/devices/%1/execute/%2").arg(deviceId.toString()).arg(actionTypeId.toString()))); + QNetworkRequest request(QUrl(QString("https://localhost:3333/api/v1/devices/%1/execute/%2").arg(deviceId.toString()).arg(actionTypeId.toString()))); request.setHeader(QNetworkRequest::ContentTypeHeader, "text/json"); QVariant response = postAndWait(request, params, expectedStatusCode); QVERIFY2(!response.isNull(), "Could not read execute action response"); @@ -512,10 +512,10 @@ void TestRestDevices::getStateValue() request.setHeader(QNetworkRequest::ContentTypeHeader, "text/json"); if (!stateTypeId.isNull()) { - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/devices/%1/states/%2").arg(deviceId).arg(stateTypeId))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/devices/%1/states/%2").arg(deviceId).arg(stateTypeId))); } else { // Get all states - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/devices/%1/states").arg(deviceId))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/devices/%1/states").arg(deviceId))); } QVariant response = getAndWait(request, expectedStatusCode); QVERIFY2(!response.isNull(), "Could not read get state value response"); @@ -549,7 +549,7 @@ void TestRestDevices::editDevices() params.insert("name", originalName); params.insert("deviceParams", deviceParams); - QNetworkRequest addRequest(QUrl("http://localhost:3333/api/v1/devices")); + QNetworkRequest addRequest(QUrl("https://localhost:3333/api/v1/devices")); addRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); QVariant response = postAndWait(addRequest, params); @@ -560,7 +560,7 @@ void TestRestDevices::editDevices() params.clear(); params.insert("name", name); - QNetworkRequest deviceRequest(QUrl(QString("http://localhost:3333/api/v1/devices/%1").arg(deviceId.toString()))); + QNetworkRequest deviceRequest(QUrl(QString("https://localhost:3333/api/v1/devices/%1").arg(deviceId.toString()))); deviceRequest.setHeader(QNetworkRequest::ContentTypeHeader, "application/json"); response = postAndWait(deviceRequest, params); @@ -641,7 +641,7 @@ void TestRestDevices::reconfigureDevices() params.insert("deviceParams", deviceParams); // ADD a mockdevice - QNetworkRequest request(QUrl(QString("http://localhost:3333/api/v1/devices"))); + QNetworkRequest request(QUrl(QString("https://localhost:3333/api/v1/devices"))); request.setHeader(QNetworkRequest::ContentTypeHeader, "text/json"); QVariant response = postAndWait(request, params); @@ -655,7 +655,7 @@ void TestRestDevices::reconfigureDevices() editParams.insert("deviceId", deviceId); editParams.insert("deviceParams", newDeviceParams); - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/devices/%1").arg(deviceId.toString()))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/devices/%1").arg(deviceId.toString()))); request.setHeader(QNetworkRequest::ContentTypeHeader, "text/json"); response = putAndWait(request, editParams, expectedStatusCode); @@ -663,7 +663,7 @@ void TestRestDevices::reconfigureDevices() // if the reconfigure should have been successfull if (expectedStatusCode == 200) { - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/devices/%1").arg(deviceId.toString()))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/devices/%1").arg(deviceId.toString()))); request.setHeader(QNetworkRequest::ContentTypeHeader, "text/json"); response = getAndWait(request); QVariantMap deviceMap = response.toMap(); @@ -673,7 +673,7 @@ void TestRestDevices::reconfigureDevices() } // delete it - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/devices/%1").arg(deviceId.toString()))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/devices/%1").arg(deviceId.toString()))); response = deleteAndWait(request); QVERIFY2(!response.isNull(), "Could not delete device"); } @@ -705,7 +705,7 @@ void TestRestDevices::reconfigureByDiscovery() params.insert("deviceClassId", deviceClassId); params.insert("discoveryParams", discoveryParams); - QUrl url(QString("http://localhost:3333/api/v1/deviceclasses/%1/discover").arg(deviceClassId.toString())); + QUrl url(QString("https://localhost:3333/api/v1/deviceclasses/%1/discover").arg(deviceClassId.toString())); if (!discoveryParams.isEmpty()) { QUrlQuery query; @@ -718,7 +718,7 @@ void TestRestDevices::reconfigureByDiscovery() QCOMPARE(foundDevices.count(), resultCount); // add Discovered Device 1 port 55555 - request.setUrl(QUrl("http://localhost:3333/api/v1/devices")); + request.setUrl(QUrl("https://localhost:3333/api/v1/devices")); request.setHeader(QNetworkRequest::ContentTypeHeader, "text/json"); DeviceDescriptorId descriptorId1; foreach (const QVariant &descriptor, foundDevices) { @@ -745,7 +745,7 @@ void TestRestDevices::reconfigureByDiscovery() params.insert("deviceClassId", deviceClassId); params.insert("discoveryParams", discoveryParams); - url = QUrl(QString("http://localhost:3333/api/v1/deviceclasses/%1/discover").arg(deviceClassId.toString())); + url = QUrl(QString("https://localhost:3333/api/v1/deviceclasses/%1/discover").arg(deviceClassId.toString())); QUrlQuery query2; query2.addQueryItem("params", QJsonDocument::fromVariant(discoveryParams).toJson(QJsonDocument::Compact)); url.setQuery(query2); @@ -773,14 +773,14 @@ void TestRestDevices::reconfigureByDiscovery() params.insert("deviceId", deviceId.toString()); params.insert("deviceDescriptorId", descriptorId2); - request = QNetworkRequest(QUrl(QString("http://localhost:3333/api/v1/devices/%1").arg(deviceId.toString()))); + request = QNetworkRequest(QUrl(QString("https://localhost:3333/api/v1/devices/%1").arg(deviceId.toString()))); request.setHeader(QNetworkRequest::ContentTypeHeader, "text/json"); response = putAndWait(request, params, expectedStatusCode); QVERIFY2(!response.isNull(), "Could not delete device"); // remove added device - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/devices/%1").arg(deviceId.toString()))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/devices/%1").arg(deviceId.toString()))); response = deleteAndWait(request); QVERIFY2(!response.isNull(), "Could not delete device"); } diff --git a/tests/auto/restlogging/testrestlogging.cpp b/tests/auto/restlogging/testrestlogging.cpp index 3a3512c3..3b567fdf 100644 --- a/tests/auto/restlogging/testrestlogging.cpp +++ b/tests/auto/restlogging/testrestlogging.cpp @@ -57,7 +57,7 @@ private slots: void TestRestLogging::initLogs() { - QNetworkRequest request(QUrl("http://localhost:3333/api/v1/logs")); + QNetworkRequest request(QUrl("https://localhost:3333/api/v1/logs")); QVariant response = getAndWait(request); QVariantList logEntries = response.toList(); @@ -99,7 +99,7 @@ void TestRestLogging::invalidFilter() { QFETCH(QVariantMap, filter); - QUrl url("http://localhost:3333/api/v1/logs"); + QUrl url("https://localhost:3333/api/v1/logs"); QUrlQuery query; query.addQueryItem("filter", QJsonDocument::fromVariant(filter).toJson(QJsonDocument::Compact)); url.setQuery(query); @@ -113,7 +113,7 @@ void TestRestLogging::invalidFilter() void TestRestLogging::invalidFilterJson() { - QUrl url("http://localhost:3333/api/v1/logs"); + QUrl url("https://localhost:3333/api/v1/logs"); QUrlQuery query; query.addQueryItem("filter", "blabla:!!"); url.setQuery(query); @@ -241,7 +241,7 @@ void TestRestLogging::actionLog() params.insert("eventTypes", QVariantList() << JsonTypes::loggingEventTypeToString(Logging::LoggingEventTypeTrigger)); params.insert("values", QVariantList() << "7, true"); - QUrl url("http://localhost:3333/api/v1/logs"); + QUrl url("https://localhost:3333/api/v1/logs"); QUrlQuery query; query.addQueryItem("filter", QJsonDocument::fromVariant(params).toJson(QJsonDocument::Compact)); url.setQuery(query); @@ -326,7 +326,7 @@ void TestRestLogging::removeDevice() QSignalSpy clientSpy(m_mockTcpServer, SIGNAL(outgoingData(QUuid,QByteArray))); - QNetworkRequest deleteRequest(QUrl(QString("http://localhost:3333/api/v1/devices/%1").arg(m_mockDeviceId.toString()))); + QNetworkRequest deleteRequest(QUrl(QString("https://localhost:3333/api/v1/devices/%1").arg(m_mockDeviceId.toString()))); QVariant response = deleteAndWait(deleteRequest); QVERIFY2(!response.isNull(), "Could not delete device"); @@ -335,7 +335,7 @@ void TestRestLogging::removeDevice() QVERIFY(!notification.isNull()); // get this logentry with filter - QUrl url("http://localhost:3333/api/v1/logs"); + QUrl url("https://localhost:3333/api/v1/logs"); response = getAndWait(QNetworkRequest(url)); QVariantList logEntries = response.toList(); QVERIFY2(!logEntries.count() != 0, "No log entries left"); diff --git a/tests/auto/restplugins/testrestplugins.cpp b/tests/auto/restplugins/testrestplugins.cpp index f8f27d6f..44a729de 100644 --- a/tests/auto/restplugins/testrestplugins.cpp +++ b/tests/auto/restplugins/testrestplugins.cpp @@ -58,7 +58,7 @@ private slots: void TestRestPlugins::getPlugins() { // Get all plugins - QVariant response = getAndWait(QNetworkRequest(QUrl("http://localhost:3333/api/v1/plugins"))); + QVariant response = getAndWait(QNetworkRequest(QUrl("https://localhost:3333/api/v1/plugins"))); QVariantList pluginList = response.toList(); QVERIFY2(pluginList.count() > 0, "Not enought plugins."); @@ -66,7 +66,7 @@ void TestRestPlugins::getPlugins() foreach (const QVariant &plugin, pluginList) { QVariantMap pluginMap = plugin.toMap(); if (!VendorId(pluginMap.value("id").toString()).isNull()) { - QNetworkRequest request(QUrl(QString("http://localhost:3333/api/v1/plugins/%1").arg(pluginMap.value("id").toString()))); + QNetworkRequest request(QUrl(QString("https://localhost:3333/api/v1/plugins/%1").arg(pluginMap.value("id").toString()))); response = getAndWait(request); QVERIFY2(!response.isNull(), "Could not get plugin"); } @@ -76,10 +76,13 @@ void TestRestPlugins::getPlugins() void TestRestPlugins::invalidMethod() { QNetworkAccessManager *nam = new QNetworkAccessManager(this); + connect(nam, &QNetworkAccessManager::sslErrors, [this, nam](QNetworkReply *reply, const QList &) { + reply->ignoreSslErrors(); + }); QSignalSpy clientSpy(nam, SIGNAL(finished(QNetworkReply*))); QNetworkRequest request; - request.setUrl(QUrl("http://localhost:3333/api/v1/plugins")); + request.setUrl(QUrl("https://localhost:3333/api/v1/plugins")); QNetworkReply *reply = nam->deleteResource(request); clientSpy.wait(); @@ -97,10 +100,13 @@ void TestRestPlugins::invalidMethod() void TestRestPlugins::invalidPath() { QNetworkAccessManager *nam = new QNetworkAccessManager(this); + connect(nam, &QNetworkAccessManager::sslErrors, [this, nam](QNetworkReply *reply, const QList &) { + reply->ignoreSslErrors(); + }); QSignalSpy clientSpy(nam, SIGNAL(finished(QNetworkReply*))); QNetworkRequest request; - request.setUrl(QUrl("http://localhost:3333/api/v1/plugins/" + QUuid::createUuid().toString() + "/" + QUuid::createUuid().toString())); + request.setUrl(QUrl("https://localhost:3333/api/v1/plugins/" + QUuid::createUuid().toString() + "/" + QUuid::createUuid().toString())); QNetworkReply *reply = nam->get(request); clientSpy.wait(); @@ -129,7 +135,7 @@ void TestRestPlugins::invalidPlugin() QFETCH(QString, path); QFETCH(int, expectedStatusCode); - QNetworkRequest request(QUrl("http://localhost:3333/api/v1/vendors/" + path)); + QNetworkRequest request(QUrl("https://localhost:3333/api/v1/vendors/" + path)); QVariant response = getAndWait(request, expectedStatusCode); QCOMPARE(JsonTypes::deviceErrorToString(DeviceManager::DeviceErrorVendorNotFound), response.toMap().value("error").toString()); } @@ -137,7 +143,7 @@ void TestRestPlugins::invalidPlugin() void TestRestPlugins::getPluginConfiguration() { // Get plugin config - QNetworkRequest request(QUrl(QString("http://localhost:3333/api/v1/plugins/%1/configuration").arg(mockPluginId.toString()))); + QNetworkRequest request(QUrl(QString("https://localhost:3333/api/v1/plugins/%1/configuration").arg(mockPluginId.toString()))); QVariant response = getAndWait(request); // QVariantList configurations = response.toList(); @@ -190,7 +196,7 @@ void TestRestPlugins::getPluginConfiguration() // // Get plugin configuration // QNetworkRequest request; -// request.setUrl(QUrl(QString("http://localhost:3333/api/v1/plugins/%1/configuration").arg(pluginId.toString()))); +// request.setUrl(QUrl(QString("https://localhost:3333/api/v1/plugins/%1/configuration").arg(pluginId.toString()))); // QNetworkReply *reply = nam->get(request); // clientSpy.wait(); // QCOMPARE(clientSpy.count(), 1); @@ -209,7 +215,7 @@ void TestRestPlugins::getPluginConfiguration() // // Set new configuration // clientSpy.clear(); -// request.setUrl(QUrl(QString("http://localhost:3333/api/v1/plugins/%1/configuration").arg(pluginId.toString()))); +// request.setUrl(QUrl(QString("https://localhost:3333/api/v1/plugins/%1/configuration").arg(pluginId.toString()))); // reply = nam->put(request, QJsonDocument::fromVariant(newConfigurations).toJson(QJsonDocument::Compact)); // clientSpy.wait(); // QCOMPARE(clientSpy.count(), 1); @@ -222,7 +228,7 @@ void TestRestPlugins::getPluginConfiguration() // // check new configurations // clientSpy.clear(); -// request.setUrl(QUrl(QString("http://localhost:3333/api/v1/plugins/%1/configuration").arg(pluginId.toString()))); +// request.setUrl(QUrl(QString("https://localhost:3333/api/v1/plugins/%1/configuration").arg(pluginId.toString()))); // reply = nam->get(request); // clientSpy.wait(); // QCOMPARE(clientSpy.count(), 1); @@ -241,7 +247,7 @@ void TestRestPlugins::getPluginConfiguration() // // check new configurations after restart // clientSpy.clear(); -// request.setUrl(QUrl(QString("http://localhost:3333/api/v1/plugins/%1/configuration").arg(pluginId.toString()))); +// request.setUrl(QUrl(QString("https://localhost:3333/api/v1/plugins/%1/configuration").arg(pluginId.toString()))); // reply = nam->get(request); // clientSpy.wait(); // QCOMPARE(clientSpy.count(), 1); diff --git a/tests/auto/restrules/testrestrules.cpp b/tests/auto/restrules/testrestrules.cpp index 6304eeb9..4395281b 100644 --- a/tests/auto/restrules/testrestrules.cpp +++ b/tests/auto/restrules/testrestrules.cpp @@ -89,7 +89,7 @@ void TestRestRules::cleanupMockHistory() void TestRestRules::cleanupRules() { // Get all rules - QNetworkRequest request(QUrl("http://localhost:3333/api/v1/rules")); + QNetworkRequest request(QUrl("https://localhost:3333/api/v1/rules")); QVariant response = getAndWait(request); QVERIFY(!response.isNull()); QVariantList rulesList = response.toList(); @@ -97,7 +97,7 @@ void TestRestRules::cleanupRules() // delete each rule foreach (const QVariant &rule, rulesList) { QVariantMap ruleMap = rule.toMap(); - QNetworkRequest request(QUrl(QString("http://localhost:3333/api/v1/rules/%1").arg(ruleMap.value("id").toString()))); + QNetworkRequest request(QUrl(QString("https://localhost:3333/api/v1/rules/%1").arg(ruleMap.value("id").toString()))); response = deleteAndWait(request); QVERIFY(!response.isNull()); } @@ -196,13 +196,13 @@ QVariant TestRestRules::validIntStateBasedRule(const QString &name, const bool & void TestRestRules::getRules() { // Get all rules - QVariant response = getAndWait(QNetworkRequest(QUrl("http://localhost:3333/api/v1/rules"))); + QVariant response = getAndWait(QNetworkRequest(QUrl("https://localhost:3333/api/v1/rules"))); QVariantList rulesList = response.toList(); QVERIFY2(rulesList.count() == 0, "Not enought rules"); foreach (const QVariant &rule, rulesList) { QVariantMap ruleMap = rule.toMap(); - QNetworkRequest request(QUrl(QString("http://localhost:3333/api/v1/rules/%1").arg(ruleMap.value("id").toString()))); + QNetworkRequest request(QUrl(QString("https://localhost:3333/api/v1/rules/%1").arg(ruleMap.value("id").toString()))); request.setHeader(QNetworkRequest::ContentTypeHeader, "text/json"); response = getAndWait(request); @@ -213,14 +213,14 @@ void TestRestRules::getRules() void TestRestRules::findRule() { QVariant params = validIntStateBasedRule("Find", true, true); - QNetworkRequest request(QUrl(QString("http://localhost:3333/api/v1/rules"))); + QNetworkRequest request(QUrl(QString("https://localhost:3333/api/v1/rules"))); request.setHeader(QNetworkRequest::ContentTypeHeader, "text/json"); QVariant response = postAndWait(request, params); RuleId ruleId = RuleId(response.toMap().value("id").toString()); QVERIFY(!ruleId.isNull()); - QUrl url(QString("http://localhost:3333/api/v1/rules")); + QUrl url(QString("https://localhost:3333/api/v1/rules")); QUrlQuery query; query.addQueryItem("deviceId", m_mockDeviceId.toString()); url.setQuery(query); @@ -229,13 +229,13 @@ void TestRestRules::findRule() QVERIFY(!response.isNull()); // REMOVE rule - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/rules/%1").arg(ruleId.toString()))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/rules/%1").arg(ruleId.toString()))); response = deleteAndWait(request); QVERIFY(!response.isNull()); QCOMPARE(JsonTypes::ruleErrorToString(RuleEngine::RuleErrorNoError), response.toMap().value("error").toString()); // check if removed - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/rules/%1").arg(ruleId.toString()))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/rules/%1").arg(ruleId.toString()))); response = getAndWait(request, 404); QVERIFY(!response.isNull()); } @@ -243,10 +243,13 @@ void TestRestRules::findRule() void TestRestRules::invalidMethod() { QNetworkAccessManager nam; + connect(&nam, &QNetworkAccessManager::sslErrors, [this, &nam](QNetworkReply *reply, const QList &) { + reply->ignoreSslErrors(); + }); QSignalSpy clientSpy(&nam, SIGNAL(finished(QNetworkReply*))); QNetworkRequest request; - request.setUrl(QUrl("http://localhost:3333/api/v1/rules")); + request.setUrl(QUrl("https://localhost:3333/api/v1/rules")); QNetworkReply *reply = nam.sendCustomRequest(request, "TRACE"); clientSpy.wait(); @@ -263,10 +266,13 @@ void TestRestRules::invalidMethod() void TestRestRules::invalidPath() { QNetworkAccessManager nam; + connect(&nam, &QNetworkAccessManager::sslErrors, [this, &nam](QNetworkReply *reply, const QList &) { + reply->ignoreSslErrors(); + }); QSignalSpy clientSpy(&nam, SIGNAL(finished(QNetworkReply*))); QNetworkRequest request; - request.setUrl(QUrl("http://localhost:3333/api/v1/rules/" + QUuid::createUuid().toString() + "/" + QUuid::createUuid().toString())); + request.setUrl(QUrl("https://localhost:3333/api/v1/rules/" + QUuid::createUuid().toString() + "/" + QUuid::createUuid().toString())); QNetworkReply *reply = nam.get(request); clientSpy.wait(); @@ -282,7 +288,7 @@ void TestRestRules::invalidPath() void TestRestRules::checkOptionCall() { - QNetworkRequest request(QUrl(QString("http://localhost:3333/api/v1/rules"))); + QNetworkRequest request(QUrl(QString("https://localhost:3333/api/v1/rules"))); request.setHeader(QNetworkRequest::ContentTypeHeader, "text/json"); QVariant response = postAndWait(request, validIntStateBasedRule("Options", true, true)); @@ -290,9 +296,12 @@ void TestRestRules::checkOptionCall() QVERIFY(!ruleId.isNull()); QNetworkAccessManager nam; + connect(&nam, &QNetworkAccessManager::sslErrors, [this, &nam](QNetworkReply *reply, const QList &) { + reply->ignoreSslErrors(); + }); QSignalSpy clientSpy(&nam, SIGNAL(finished(QNetworkReply*))); - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/rules/%1").arg(ruleId.toString()))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/rules/%1").arg(ruleId.toString()))); QNetworkReply *reply = nam.sendCustomRequest(request, "OPTIONS"); clientSpy.wait(); @@ -306,13 +315,13 @@ void TestRestRules::checkOptionCall() reply->deleteLater(); // REMOVE rule - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/rules/%1").arg(ruleId.toString()))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/rules/%1").arg(ruleId.toString()))); response = deleteAndWait(request); QVERIFY(!response.isNull()); QCOMPARE(JsonTypes::ruleErrorToString(RuleEngine::RuleErrorNoError), response.toMap().value("error").toString()); // check if removed - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/rules/%1").arg(ruleId.toString()))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/rules/%1").arg(ruleId.toString()))); response = getAndWait(request, 404); QVERIFY(!response.isNull()); } @@ -505,13 +514,13 @@ void TestRestRules::addRemoveRules() } // Get rules and verify there is no rule added - QNetworkRequest request(QUrl("http://localhost:3333/api/v1/rules")); + QNetworkRequest request(QUrl("https://localhost:3333/api/v1/rules")); QVariant response = getAndWait(request); QVariantList rulesList = response.toList(); QVERIFY2(rulesList.count() == 0, "there should be no rules."); // ADD rule - request = QNetworkRequest(QUrl(QString("http://localhost:3333/api/v1/rules"))); + request = QNetworkRequest(QUrl(QString("https://localhost:3333/api/v1/rules"))); request.setHeader(QNetworkRequest::ContentTypeHeader, "text/json"); response = postAndWait(request, params, expectedStatusCode); @@ -524,13 +533,13 @@ void TestRestRules::addRemoveRules() qDebug() << QJsonDocument::fromVariant(response).toJson(); // GET rule details - request = QNetworkRequest(QUrl(QString("http://localhost:3333/api/v1/rules/%1").arg(ruleId.toString()))); + request = QNetworkRequest(QUrl(QString("https://localhost:3333/api/v1/rules/%1").arg(ruleId.toString()))); //request.setHeader(QNetworkRequest::ContentTypeHeader, "text/json"); response = getAndWait(request); QVERIFY(!response.isNull()); // REMOVE rule - request = QNetworkRequest(QUrl(QString("http://localhost:3333/api/v1/rules/%1").arg(ruleId.toString()))); + request = QNetworkRequest(QUrl(QString("https://localhost:3333/api/v1/rules/%1").arg(ruleId.toString()))); request.setHeader(QNetworkRequest::ContentTypeHeader, "text/json"); response = deleteAndWait(request); QVERIFY(!response.isNull()); @@ -544,7 +553,7 @@ void TestRestRules::emptyRule() params.insert("actions", QVariantList()); // Get rules and verify there is no rule added - QNetworkRequest request = QNetworkRequest(QUrl(QString("http://localhost:3333/api/v1/rules"))); + QNetworkRequest request = QNetworkRequest(QUrl(QString("https://localhost:3333/api/v1/rules"))); request.setHeader(QNetworkRequest::ContentTypeHeader, "text/json"); QVariant response = postAndWait(request, params, 400); @@ -798,13 +807,13 @@ void TestRestRules::editRules() params.insert("name", "TestRule"); // Get rules and verify there is no rule added - QNetworkRequest request(QUrl("http://localhost:3333/api/v1/rules")); + QNetworkRequest request(QUrl("https://localhost:3333/api/v1/rules")); QVariant response = getAndWait(request); QVariantList rulesList = response.toList(); QVERIFY2(rulesList.count() == 0, "there should be no rules."); // ADD rule - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/rules"))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/rules"))); request.setHeader(QNetworkRequest::ContentTypeHeader, "text/json"); response = postAndWait(request, params); QVERIFY(!response.isNull()); @@ -838,25 +847,25 @@ void TestRestRules::editRules() } // EDIT rule - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/rules/%1").arg(ruleId.toString()))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/rules/%1").arg(ruleId.toString()))); request.setHeader(QNetworkRequest::ContentTypeHeader, "text/json"); response = putAndWait(request, params, expectedStatusCode); QVERIFY(!response.isNull()); if (expectedStatusCode == 200) { // get edit rule and verify params - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/rules"))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/rules"))); response = getAndWait(request); QVERIFY(!response.isNull()); } // REMOVE rule - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/rules/%1").arg(ruleId.toString()))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/rules/%1").arg(ruleId.toString()))); response = deleteAndWait(request); QVERIFY(!response.isNull()); // check if removed - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/rules/%1").arg(ruleId.toString()))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/rules/%1").arg(ruleId.toString()))); response = getAndWait(request, 404); QVERIFY(!response.isNull()); } @@ -880,14 +889,14 @@ void TestRestRules::enableDisableRule() addRuleParams.insert("actions", actions); // ADD rule - QNetworkRequest request = QNetworkRequest(QUrl(QString("http://localhost:3333/api/v1/rules"))); + QNetworkRequest request = QNetworkRequest(QUrl(QString("https://localhost:3333/api/v1/rules"))); request.setHeader(QNetworkRequest::ContentTypeHeader, "text/json"); QVariant response = postAndWait(request, addRuleParams); RuleId ruleId = RuleId(response.toMap().value("id").toString()); QVERIFY(!ruleId.isNull()); // ENABLE rule - request = QNetworkRequest(QUrl(QString("http://localhost:3333/api/v1/rules/%1/enable").arg(ruleId.toString()))); + request = QNetworkRequest(QUrl(QString("https://localhost:3333/api/v1/rules/%1/enable").arg(ruleId.toString()))); response = postAndWait(request, QVariant()); QVERIFY2(!response.isNull(), "Could not read response"); @@ -898,7 +907,7 @@ void TestRestRules::enableDisableRule() cleanupMockHistory(); // DISABLE the rule - request = QNetworkRequest(QUrl(QString("http://localhost:3333/api/v1/rules/%1/disable").arg(ruleId.toString()))); + request = QNetworkRequest(QUrl(QString("https://localhost:3333/api/v1/rules/%1/disable").arg(ruleId.toString()))); response = postAndWait(request, QVariant()); QVERIFY2(!response.isNull(), "Could not read response"); @@ -909,7 +918,7 @@ void TestRestRules::enableDisableRule() cleanupMockHistory(); // ENABLE again - request = QNetworkRequest(QUrl(QString("http://localhost:3333/api/v1/rules/%1/enable").arg(ruleId.toString()))); + request = QNetworkRequest(QUrl(QString("https://localhost:3333/api/v1/rules/%1/enable").arg(ruleId.toString()))); response = postAndWait(request, QVariant()); QVERIFY2(!response.isNull(), "Could not read response"); @@ -939,20 +948,20 @@ void TestRestRules::executeRuleActions() QFETCH(RuleEngine::RuleError, ruleError); // ADD rule - QNetworkRequest request(QUrl(QString("http://localhost:3333/api/v1/rules"))); + QNetworkRequest request(QUrl(QString("https://localhost:3333/api/v1/rules"))); request.setHeader(QNetworkRequest::ContentTypeHeader, "text/json"); QVariant response = postAndWait(request, params); RuleId ruleId = RuleId(response.toMap().value("id").toString()); QVERIFY(!ruleId.isNull()); - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/rules/%1").arg(ruleId.toString()))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/rules/%1").arg(ruleId.toString()))); response = getAndWait(request); cleanupMockHistory(); // EXECUTE actions - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/rules/%1/executeactions").arg(ruleId.toString()))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/rules/%1/executeactions").arg(ruleId.toString()))); response = postAndWait(request, QVariant(), expectedStatusCode); QVERIFY(!response.isNull()); QCOMPARE(JsonTypes::ruleErrorToString(ruleError), response.toMap().value("error").toString()); @@ -966,7 +975,7 @@ void TestRestRules::executeRuleActions() cleanupMockHistory(); // EXECUTE exit actions - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/rules/%1/executeexitactions").arg(ruleId.toString()))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/rules/%1/executeexitactions").arg(ruleId.toString()))); response = postAndWait(request, QVariant(), expectedStatusCode); QVERIFY(!response.isNull()); QCOMPARE(JsonTypes::ruleErrorToString(ruleError), response.toMap().value("error").toString()); @@ -980,13 +989,13 @@ void TestRestRules::executeRuleActions() cleanupMockHistory(); // REMOVE rule - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/rules/%1").arg(ruleId.toString()))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/rules/%1").arg(ruleId.toString()))); response = deleteAndWait(request); QVERIFY(!response.isNull()); QCOMPARE(JsonTypes::ruleErrorToString(RuleEngine::RuleErrorNoError), response.toMap().value("error").toString()); // check if removed - request.setUrl(QUrl(QString("http://localhost:3333/api/v1/rules/%1").arg(ruleId.toString()))); + request.setUrl(QUrl(QString("https://localhost:3333/api/v1/rules/%1").arg(ruleId.toString()))); response = getAndWait(request, 404); QVERIFY(!response.isNull()); } diff --git a/tests/auto/restvendors/testrestvendors.cpp b/tests/auto/restvendors/testrestvendors.cpp index b5d43274..89c08145 100644 --- a/tests/auto/restvendors/testrestvendors.cpp +++ b/tests/auto/restvendors/testrestvendors.cpp @@ -53,7 +53,7 @@ private slots: void TestRestVendors::getVendors() { // Get all vendors - QVariant response = getAndWait(QNetworkRequest(QUrl("http://localhost:3333/api/v1/vendors"))); + QVariant response = getAndWait(QNetworkRequest(QUrl("https://localhost:3333/api/v1/vendors"))); QVariantList vendorList = response.toList(); QVERIFY2(vendorList.count() > 0, "Not enought vendors."); @@ -61,7 +61,7 @@ void TestRestVendors::getVendors() foreach (const QVariant &vendor, vendorList) { QVariantMap vendorMap = vendor.toMap(); if (!VendorId(vendorMap.value("id").toString()).isNull()) { - QNetworkRequest request(QUrl(QString("http://localhost:3333/api/v1/vendors/%1").arg(vendorMap.value("id").toString()))); + QNetworkRequest request(QUrl(QString("https://localhost:3333/api/v1/vendors/%1").arg(vendorMap.value("id").toString()))); response = getAndWait(request); QVERIFY2(!response.isNull(), "Could not get vendor"); } @@ -71,10 +71,13 @@ void TestRestVendors::getVendors() void TestRestVendors::invalidMethod() { QNetworkAccessManager nam; + connect(&nam, &QNetworkAccessManager::sslErrors, [this, &nam](QNetworkReply *reply, const QList &) { + reply->ignoreSslErrors(); + }); QSignalSpy clientSpy(&nam, SIGNAL(finished(QNetworkReply*))); QNetworkRequest request; - request.setUrl(QUrl("http://localhost:3333/api/v1/vendors")); + request.setUrl(QUrl("https://localhost:3333/api/v1/vendors")); QNetworkReply *reply = nam.post(request, QByteArray()); clientSpy.wait(); @@ -91,10 +94,13 @@ void TestRestVendors::invalidMethod() void TestRestVendors::invalidPath() { QNetworkAccessManager nam; + connect(&nam, &QNetworkAccessManager::sslErrors, [this, &nam](QNetworkReply *reply, const QList &) { + reply->ignoreSslErrors(); + }); QSignalSpy clientSpy(&nam, SIGNAL(finished(QNetworkReply*))); QNetworkRequest request; - request.setUrl(QUrl("http://localhost:3333/api/v1/vendors/" + QUuid::createUuid().toString() + "/" + QUuid::createUuid().toString())); + request.setUrl(QUrl("https://localhost:3333/api/v1/vendors/" + QUuid::createUuid().toString() + "/" + QUuid::createUuid().toString())); QNetworkReply *reply = nam.get(request); clientSpy.wait(); @@ -122,7 +128,7 @@ void TestRestVendors::invalidVendor() QFETCH(QString, path); QFETCH(int, expectedStatusCode); - QNetworkRequest request(QUrl("http://localhost:3333/api/v1/vendors/" + path)); + QNetworkRequest request(QUrl("https://localhost:3333/api/v1/vendors/" + path)); QVariant response = getAndWait(request, expectedStatusCode); QCOMPARE(JsonTypes::deviceErrorToString(DeviceManager::DeviceErrorVendorNotFound), response.toMap().value("error").toString()); }