From fdfe31e064758d83500f9e0ad806881caa836411 Mon Sep 17 00:00:00 2001 From: Filip Bucek Date: Tue, 18 Feb 2020 13:49:36 +0100 Subject: [PATCH] fix: wrong finish time in request handling * fixed signal warning * suppressing SSL messages in tests --- src/serversdk/request.h | 6 +++--- test/auto/request/tst_requestmanager.cpp | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/serversdk/request.h b/src/serversdk/request.h index 9af764a..24d150f 100644 --- a/src/serversdk/request.h +++ b/src/serversdk/request.h @@ -44,11 +44,11 @@ public: QString basicAuthorization() const; QString bearerAuthorization() const; - // Additional attributes - void logStartTime() { mStartTime = QDateTime::currentDateTime(); } - void logFinishTime() { mStartTime = QDateTime::currentDateTime(); } private: + // Additional attributes + void logStartTime() { mStartTime = QDateTime::currentDateTime(); } + void logFinishTime() { mFinishTime = QDateTime::currentDateTime(); } // Data handling void appendResponseData(const QByteArray &array); diff --git a/test/auto/request/tst_requestmanager.cpp b/test/auto/request/tst_requestmanager.cpp index 54c1d0f..a02da76 100644 --- a/test/auto/request/tst_requestmanager.cpp +++ b/test/auto/request/tst_requestmanager.cpp @@ -26,6 +26,10 @@ namespace serversdk { class RequestManagerTest : public QObject { Q_OBJECT +public: + RequestManagerTest() { + qRegisterMetaType>("std::shared_ptr"); + } private: Q_SLOT void colnodAuthorization_test(); Q_SLOT void colnodGetUpdatedTokens_test(); @@ -57,6 +61,8 @@ void RequestManagerTest::colnodAuthorization_test() QCOMPARE(loginRequest->basicAuthorization(), QStringLiteral("Basic c3BhY2V0aTpFN0ZFQTA3REJDODJGQjlCQTM0QjJFNDUzRTJFRkU4OUYwNTgzRTcxODc1NDM1MDdFRjExRTg0NzI2MDcxRkU0Mjg0NDUzNzJGMkU0NkI0NTVFQjBDNzk3NDdDNTFFMzYyRjQwM0NFMzk0NzNBMkE4QzJERkEwQ0U1Qzk4MjZDMA==")); QSignalSpy loginFinished(loginRequest.get(), &serversdk::Request::finished); + QTest::ignoreMessage(QtDebugMsg, "\"SSL error:\" \"The host name did not match any of the valid hosts for this certificate\""); + QTest::ignoreMessage(QtDebugMsg, "\"SSL error:\" \"The root CA certificate is not trusted for this purpose\""); reqMan.processRequest(loginRequest); QVERIFY(loginFinished.wait()); @@ -81,6 +87,8 @@ void RequestManagerTest::colnodGetUpdatedTokens_test() QCOMPARE(loginRequest->basicAuthorization(), QStringLiteral("Basic c3BhY2V0aTpFN0ZFQTA3REJDODJGQjlCQTM0QjJFNDUzRTJFRkU4OUYwNTgzRTcxODc1NDM1MDdFRjExRTg0NzI2MDcxRkU0Mjg0NDUzNzJGMkU0NkI0NTVFQjBDNzk3NDdDNTFFMzYyRjQwM0NFMzk0NzNBMkE4QzJERkEwQ0U1Qzk4MjZDMA==")); QSignalSpy spyFinished(loginRequest.get(), &serversdk::Request::finished); + QTest::ignoreMessage(QtDebugMsg, "\"SSL error:\" \"The host name did not match any of the valid hosts for this certificate\""); + QTest::ignoreMessage(QtDebugMsg, "\"SSL error:\" \"The root CA certificate is not trusted for this purpose\""); reqMan.processRequest(loginRequest); QVERIFY(spyFinished.wait()); @@ -115,6 +123,7 @@ void RequestManagerTest::notConncetion_test() auto tokensRequest = std::make_shared("POST", "https://localhost:9999/TokenManager/getTokensUpdated", QByteArray("{}")); //QTest::ignoreMessage(QtWarningMsg, QRegularExpression("POST.*error.*")); reqMan.processRequest(tokensRequest); + QTest::ignoreMessage(QtWarningMsg, "POST https://localhost:9999/TokenManager/getTokensUpdated data: {} header: () reply error: QNetworkReply::NetworkError(ConnectionRefusedError)"); QVERIFY(tokensRequest->networkReply()); QSignalSpy tokensFinished(tokensRequest.get(), &serversdk::Request::finished);