michalks/server-sdk
1
0
Fork 0
forked from ondra/server-sdk
Code Issues Pull Requests Projects Releases Wiki Activity

fix: wrong finish time in request handling

Browse Source 
* fixed signal warning
* suppressing SSL messages in tests
This commit is contained in:
Filip Bucek 2020-02-18 13:49:36 +01:00
parent d4c4d75b49
commit fdfe31e064
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/serversdk/request.h
View File

@ -44,11 +44,11 @@ public:
QString basicAuthorization() const; QString basicAuthorization() const;
QString bearerAuthorization() const; QString bearerAuthorization() const;
// Additional attributes
void logStartTime() { mStartTime = QDateTime::currentDateTime(); }
void logFinishTime() { mStartTime = QDateTime::currentDateTime(); }
private: private:
// Additional attributes
void logStartTime() { mStartTime = QDateTime::currentDateTime(); }
void logFinishTime() { mFinishTime = QDateTime::currentDateTime(); }
// Data handling // Data handling
void appendResponseData(const QByteArray &array); void appendResponseData(const QByteArray &array);

9
test/auto/request/tst_requestmanager.cpp
View File

@ -26,6 +26,10 @@ namespace serversdk {
class RequestManagerTest : public QObject class RequestManagerTest : public QObject
{ {
Q_OBJECT Q_OBJECT
public:
RequestManagerTest() {
qRegisterMetaType<std::shared_ptr<serversdk::Request>>("std::shared_ptr<Request>");
}
private: private:
Q_SLOT void colnodAuthorization_test(); Q_SLOT void colnodAuthorization_test();
Q_SLOT void colnodGetUpdatedTokens_test(); Q_SLOT void colnodGetUpdatedTokens_test();
@ -57,6 +61,8 @@ void RequestManagerTest::colnodAuthorization_test()
QCOMPARE(loginRequest->basicAuthorization(), QStringLiteral("Basic c3BhY2V0aTpFN0ZFQTA3REJDODJGQjlCQTM0QjJFNDUzRTJFRkU4OUYwNTgzRTcxODc1NDM1MDdFRjExRTg0NzI2MDcxRkU0Mjg0NDUzNzJGMkU0NkI0NTVFQjBDNzk3NDdDNTFFMzYyRjQwM0NFMzk0NzNBMkE4QzJERkEwQ0U1Qzk4MjZDMA==")); QCOMPARE(loginRequest->basicAuthorization(), QStringLiteral("Basic c3BhY2V0aTpFN0ZFQTA3REJDODJGQjlCQTM0QjJFNDUzRTJFRkU4OUYwNTgzRTcxODc1NDM1MDdFRjExRTg0NzI2MDcxRkU0Mjg0NDUzNzJGMkU0NkI0NTVFQjBDNzk3NDdDNTFFMzYyRjQwM0NFMzk0NzNBMkE4QzJERkEwQ0U1Qzk4MjZDMA=="));
QSignalSpy loginFinished(loginRequest.get(), &serversdk::Request::finished); 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); reqMan.processRequest(loginRequest);
QVERIFY(loginFinished.wait()); QVERIFY(loginFinished.wait());
@ -81,6 +87,8 @@ void RequestManagerTest::colnodGetUpdatedTokens_test()
QCOMPARE(loginRequest->basicAuthorization(), QStringLiteral("Basic c3BhY2V0aTpFN0ZFQTA3REJDODJGQjlCQTM0QjJFNDUzRTJFRkU4OUYwNTgzRTcxODc1NDM1MDdFRjExRTg0NzI2MDcxRkU0Mjg0NDUzNzJGMkU0NkI0NTVFQjBDNzk3NDdDNTFFMzYyRjQwM0NFMzk0NzNBMkE4QzJERkEwQ0U1Qzk4MjZDMA==")); QCOMPARE(loginRequest->basicAuthorization(), QStringLiteral("Basic c3BhY2V0aTpFN0ZFQTA3REJDODJGQjlCQTM0QjJFNDUzRTJFRkU4OUYwNTgzRTcxODc1NDM1MDdFRjExRTg0NzI2MDcxRkU0Mjg0NDUzNzJGMkU0NkI0NTVFQjBDNzk3NDdDNTFFMzYyRjQwM0NFMzk0NzNBMkE4QzJERkEwQ0U1Qzk4MjZDMA=="));
QSignalSpy spyFinished(loginRequest.get(), &serversdk::Request::finished); 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); reqMan.processRequest(loginRequest);
QVERIFY(spyFinished.wait()); QVERIFY(spyFinished.wait());
@ -115,6 +123,7 @@ void RequestManagerTest::notConncetion_test()
auto tokensRequest = std::make_shared<serversdk::Request>("POST", "https://localhost:9999/TokenManager/getTokensUpdated", QByteArray("{}")); auto tokensRequest = std::make_shared<serversdk::Request>("POST", "https://localhost:9999/TokenManager/getTokensUpdated", QByteArray("{}"));
//QTest::ignoreMessage(QtWarningMsg, QRegularExpression("POST.*error.*")); //QTest::ignoreMessage(QtWarningMsg, QRegularExpression("POST.*error.*"));
reqMan.processRequest(tokensRequest); reqMan.processRequest(tokensRequest);
QTest::ignoreMessage(QtWarningMsg, "POST https://localhost:9999/TokenManager/getTokensUpdated data: {} header: () reply error: QNetworkReply::NetworkError(ConnectionRefusedError)");
QVERIFY(tokensRequest->networkReply()); QVERIFY(tokensRequest->networkReply());
QSignalSpy tokensFinished(tokensRequest.get(), &serversdk::Request::finished); QSignalSpy tokensFinished(tokensRequest.get(), &serversdk::Request::finished);