From c44def76503d4f8a0c8359ee3387fababc77329d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Fischer?= Date: Tue, 1 Oct 2019 13:33:00 +0200 Subject: [PATCH] fix for Qt 5.9 --- src/colnod/requestmanager.cpp | 5 +++-- src/colnod/requestmanager.h | 2 +- test/unitTests/UnitTest.cpp | 10 +++++----- test/unitTests/unittest.h | 10 ++++------ 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/colnod/requestmanager.cpp b/src/colnod/requestmanager.cpp index 959d78a..0e70863 100644 --- a/src/colnod/requestmanager.cpp +++ b/src/colnod/requestmanager.cpp @@ -78,11 +78,12 @@ void RequestManager::getRequest(QString endpoint) qDebug() << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute); jsonResponse = reply->readAll(); + //qDebug() << jsonResponse; emit responseReady(); }); } -QString RequestManager::getFromJson(QString json, QString member) +QString RequestManager::getFromJson(QString json, const QString &member) { QJsonParseError err; QJsonDocument document = QJsonDocument::fromJson(json.toUtf8(),&err); @@ -90,7 +91,7 @@ QString RequestManager::getFromJson(QString json, QString member) { qDebug() << err.errorString(); } - return document[member].toString(); + return document.object().value(member).toString(); } QString RequestManager::encryptedPassword(QString password) diff --git a/src/colnod/requestmanager.h b/src/colnod/requestmanager.h index e2b1923..b905c1c 100644 --- a/src/colnod/requestmanager.h +++ b/src/colnod/requestmanager.h @@ -34,7 +34,7 @@ public: QString getToken(){return token;} private: - QString getFromJson(QString json, QString member); + QString getFromJson(QString json, const QString &member); QString encryptedPassword(QString password); QString getLoginHeader(QString username, QString hash); void prepareAuthHeader(); diff --git a/test/unitTests/UnitTest.cpp b/test/unitTests/UnitTest.cpp index abf55aa..bf9fc29 100644 --- a/test/unitTests/UnitTest.cpp +++ b/test/unitTests/UnitTest.cpp @@ -12,7 +12,7 @@ void UnitTest::loginSuccessfully() QString json = testAccess->getResponse(); qDebug() << json; QJsonDocument doc = QJsonDocument::fromJson(json.toUtf8()); - QVERIFY2(doc["id"].isString(), "No parameter 'id' in response"); + QVERIFY2(doc.object().value("id").isString(), "No parameter 'id' in response"); } //POST request w/o datas @@ -28,9 +28,9 @@ void UnitTest::getSubjects() QString json = testAccess->getResponse(); QJsonDocument doc = QJsonDocument::fromJson(json.toUtf8()); QVERIFY(doc.isObject()); - QVERIFY2(doc["items"].isArray(), "No parameter 'id' in response"); - qDebug() << doc["items"].toArray()[0].toObject()["id"].toString(); - QVERIFY2(doc["items"].toArray()[0].toObject()["id"].isString(), "ada"); + QVERIFY2(doc.object().value("items").isArray(), "No parameter 'id' in response"); + qDebug() << doc.object().value("items").toArray()[0].toObject()["id"].toString(); + QVERIFY2(doc.object().value("items").toArray()[0].toObject()["id"].isString(), "ada"); } @@ -58,8 +58,8 @@ void UnitTest::getTokensOpenManager() QVERIFY(spy.isValid()); QCOMPARE(spy.count(), 1); QString response = testAccess->getResponse(); - QVERIFY(!response.isEmpty()); qDebug() << response; + QVERIFY(!response.isEmpty()); } diff --git a/test/unitTests/unittest.h b/test/unitTests/unittest.h index ae27657..e22c253 100644 --- a/test/unitTests/unittest.h +++ b/test/unitTests/unittest.h @@ -11,12 +11,10 @@ class UnitTest : public QObject private slots: - void loginSuccessfully(); - - - void getTokens(); - void getTokensOpenManager(); - void getSubjects(); + void loginSuccessfully(); // /AaaManager/authSession + void getSubjects(); // /SubjectManager/getSubjects + void getTokens(); // /TokenManager/getTokens + void getTokensOpenManager(); // /OpenManager/getTokenSubject private: // QString host = "https://localhost:8080"; //colnod server (ssh -L 8080:192.168.254.11:8443 penta-master)