diff --git a/test/unitTests/UnitTest.cpp b/test/unitTests/UnitTest.cpp index f245487..0093e95 100644 --- a/test/unitTests/UnitTest.cpp +++ b/test/unitTests/UnitTest.cpp @@ -204,20 +204,10 @@ void UnitTest::getAccessGroupMembershipDeleted() void UnitTest::setTokens() { - QFile jsonData(QDir::current().filePath("tokens.json")); - QVERIFY2(jsonData.open(QIODevice::ReadOnly), "Couldn't open config file tokens.json"); - QJsonDocument doc = QJsonDocument::fromJson(jsonData.readAll()); - QJsonObject obj = doc.object(); - QJsonArray arr = obj["items"].toArray(); - qDebug() << arr; QHash> tokens; - for (auto object : arr) - { - auto token = std::shared_ptr(); - token->fromJSON(object.toObject()); - tokens.insert(token->idToStringWithoutBraces(), token); - } + auto token = getTestToken(); + tokens.insert(token->idToStringWithoutBraces(), token); auto testAccess = new RequestManager(); QSignalSpy spy(testAccess, SIGNAL(responseReady())); Response* response = testAccess->setTokens(tokens); @@ -353,6 +343,25 @@ void UnitTest::getUuid() QCOMPARE(1,1); } +std::shared_ptr UnitTest::getTestToken() +{ + QJsonObject jsonToken; + jsonToken.insert("id", "062c93f6-ba3e-46af-a3a6-7a2988d1f0e9"); + jsonToken.insert("name", "test"); + jsonToken.insert("description", "mobile"); + jsonToken.insert("tokenType", "Token"); + jsonToken.insert("tokenBits", 32); + jsonToken.insert("tokenData", "7B9D32"); + jsonToken.insert("timeToLive", 255); + jsonToken.insert("authErrors", 255); + QJsonArray flags; + flags.push_back("Enabled"); + flags.push_back("NoValidity"); + jsonToken.insert("flags", flags); + jsonToken.insert("subjectId", "72b37f7e-5761-4e6c-8e87-20c0bed0d904"); + auto token = std::make_shared(); + token->fromJSON(jsonToken); + return token; +} - -//QTEST_MAIN(UnitTest) +QTEST_MAIN(UnitTest) diff --git a/test/unitTests/complextest.cpp b/test/unitTests/complextest.cpp index 36ee3e5..6e7ae9d 100644 --- a/test/unitTests/complextest.cpp +++ b/test/unitTests/complextest.cpp @@ -34,88 +34,88 @@ void ComplexTest::cleanupTestCase() void ComplexTest::complexTest() { - // LOGIN_BEGIN - reqMan = new RequestManager; - QSignalSpy loginSpy(reqMan, &RequestManager::successLogin); - auto loginResp = reqMan->login(); - QSignalSpy loginRespSpy(loginResp.get(), &Response::ready); - QCOMPARE(loginSpy.count(), 0); - QCOMPARE(loginRespSpy.count(), 0); - loginSpy.wait(timeout); - QCOMPARE(loginResp->getStatusCode(), 200); // HTTP status code check - QCOMPARE(loginSpy.count(), 1); // Checking multiple calls - QCOMPARE(loginRespSpy.count(), 1); - auto doc0 = getJsonDoc(loginResp->getJson()); - QVERIFY(doc0.object()["id"].isString()); - // LOGIN_END +// // LOGIN_BEGIN +// reqMan = new RequestManager; +// QSignalSpy loginSpy(reqMan, &RequestManager::successLogin); +// auto loginResp = reqMan->login(); +// QSignalSpy loginRespSpy(loginResp.get(), &Response::ready); +// QCOMPARE(loginSpy.count(), 0); +// QCOMPARE(loginRespSpy.count(), 0); +// loginSpy.wait(timeout); +// QCOMPARE(loginResp->getStatusCode(), 200); // HTTP status code check +// QCOMPARE(loginSpy.count(), 1); // Checking multiple calls +// QCOMPARE(loginRespSpy.count(), 1); +// auto doc0 = getJsonDoc(loginResp->getJson()); +// QVERIFY(doc0.object()["id"].isString()); +// // LOGIN_END - // NUMBER_OF_SUBJECTS_AND_TOKENS_BEGIN - int numOfSubjects = getNumOfSubjects(); - QCOMPARE(numOfSubjects, 2893); // should be still the same, if false db has been changed - int numOfTokens = getNumOfTokens(); - QCOMPARE(numOfTokens, 2881); // should be still the same, if false db has been changed, or deleteTokens didnt work in previous test - // NUMBER_OF_SUBJECTS_AND_TOKENS_END +// // NUMBER_OF_SUBJECTS_AND_TOKENS_BEGIN +// int numOfSubjects = getNumOfSubjects(); +// QCOMPARE(numOfSubjects, 2893); // should be still the same, if false db has been changed +// int numOfTokens = getNumOfTokens(); +// QCOMPARE(numOfTokens, 2881); // should be still the same, if false db has been changed, or deleteTokens didnt work in previous test +// // NUMBER_OF_SUBJECTS_AND_TOKENS_END - // ADD_TOKENS_CHECK_BEGIN - QHash> tokens; - auto token = getTestToken(); - tokens.insert(token->idToStringWithoutBraces(), token); - Response* setTokensResp = reqMan->setTokens(tokens); - QSignalSpy setTokensRespSpy(setTokensResp, &Response::ready); - QCOMPARE(setTokensRespSpy.count(), 0); - setTokensRespSpy.wait(timeout); - QCOMPARE(setTokensRespSpy.count(), 1); - QCOMPARE(setTokensResp->getStatusCode(), 200); - QCOMPARE(getNumOfTokens(), numOfTokens + 1); - // ADD_TOKENS_CHEK_END +// // ADD_TOKENS_CHECK_BEGIN +// QHash> tokens; +// auto token = getTestToken(); +// tokens.insert(token->idToStringWithoutBraces(), token); +// Response* setTokensResp = reqMan->setTokens(tokens); +// QSignalSpy setTokensRespSpy(setTokensResp, &Response::ready); +// QCOMPARE(setTokensRespSpy.count(), 0); +// setTokensRespSpy.wait(timeout); +// QCOMPARE(setTokensRespSpy.count(), 1); +// QCOMPARE(setTokensResp->getStatusCode(), 200); +// QCOMPARE(getNumOfTokens(), numOfTokens + 1); +// // ADD_TOKENS_CHEK_END - // CHECK_UPDATED_TOKENS_BEGIN - Response* getTokensUpdatedResp = reqMan->getTokensUpdated(start); - //start = QDateTime::currentMSecsSinceEpoch(); - QSignalSpy getTokensUpdatedRespSpy(getTokensUpdatedResp, &Response::ready); - QCOMPARE(getTokensUpdatedRespSpy.count(), 0); - getTokensUpdatedRespSpy.wait(timeout); - QCOMPARE(getTokensUpdatedResp->getStatusCode(), 200); - QCOMPARE(getTokensUpdatedRespSpy.count(), 1); - auto doc1 = getJsonDoc(getTokensUpdatedResp->getJson()); - QCOMPARE(doc1.object()["items"].toArray().size(), 1); - // CHECK_UPDATED_TOKENS_END +// // CHECK_UPDATED_TOKENS_BEGIN +// Response* getTokensUpdatedResp = reqMan->getTokensUpdated(start); +// //start = QDateTime::currentMSecsSinceEpoch(); +// QSignalSpy getTokensUpdatedRespSpy(getTokensUpdatedResp, &Response::ready); +// QCOMPARE(getTokensUpdatedRespSpy.count(), 0); +// getTokensUpdatedRespSpy.wait(timeout); +// QCOMPARE(getTokensUpdatedResp->getStatusCode(), 200); +// QCOMPARE(getTokensUpdatedRespSpy.count(), 1); +// auto doc1 = getJsonDoc(getTokensUpdatedResp->getJson()); +// QCOMPARE(doc1.object()["items"].toArray().size(), 1); +// // CHECK_UPDATED_TOKENS_END - // DELETE_TOKENS_CHECK_BEGIN - QList ids; - ids.append("062c93f6-ba3e-46af-a3a6-7a2988d1f0e9"); - Response* deleteTokensResp = reqMan->deleteTokens(ids); - QSignalSpy deleteTokensRespSpy(deleteTokensResp, &Response::ready); - QCOMPARE(deleteTokensRespSpy.count(), 0); - deleteTokensRespSpy.wait(timeout); - QCOMPARE(deleteTokensRespSpy.count(), 1); - QCOMPARE(deleteTokensResp->getStatusCode(), 200); - // DELETE_TOKENS_CHECK_END +// // DELETE_TOKENS_CHECK_BEGIN +// QList ids; +// ids.append("062c93f6-ba3e-46af-a3a6-7a2988d1f0e9"); +// Response* deleteTokensResp = reqMan->deleteTokens(ids); +// QSignalSpy deleteTokensRespSpy(deleteTokensResp, &Response::ready); +// QCOMPARE(deleteTokensRespSpy.count(), 0); +// deleteTokensRespSpy.wait(timeout); +// QCOMPARE(deleteTokensRespSpy.count(), 1); +// QCOMPARE(deleteTokensResp->getStatusCode(), 200); +// // DELETE_TOKENS_CHECK_END - // CHECK_DELETED_TOKENS_BEGIN - Response* getTokensDeletedResp = reqMan->getTokensDeleted(start); - start = QDateTime::currentMSecsSinceEpoch(); - QSignalSpy getTokensDeletedRespSpy(getTokensDeletedResp, &Response::ready); - QCOMPARE(getTokensDeletedRespSpy.count(), 0); - getTokensDeletedRespSpy.wait(timeout); - QCOMPARE(getTokensDeletedResp->getStatusCode(), 200); - QCOMPARE(getTokensDeletedRespSpy.count(), 1); - auto doc2 = getJsonDoc(getTokensDeletedResp->getJson()); - QCOMPARE(doc2.object()["items"].toArray().size(), 1); - QVERIFY(doc2.object()["items"].toArray().contains("062c93f6-ba3e-46af-a3a6-7a2988d1f0e9")); - // CHECK_DELETED_TOKENS_END +// // CHECK_DELETED_TOKENS_BEGIN +// Response* getTokensDeletedResp = reqMan->getTokensDeleted(start); +// start = QDateTime::currentMSecsSinceEpoch(); +// QSignalSpy getTokensDeletedRespSpy(getTokensDeletedResp, &Response::ready); +// QCOMPARE(getTokensDeletedRespSpy.count(), 0); +// getTokensDeletedRespSpy.wait(timeout); +// QCOMPARE(getTokensDeletedResp->getStatusCode(), 200); +// QCOMPARE(getTokensDeletedRespSpy.count(), 1); +// auto doc2 = getJsonDoc(getTokensDeletedResp->getJson()); +// QCOMPARE(doc2.object()["items"].toArray().size(), 1); +// QVERIFY(doc2.object()["items"].toArray().contains("062c93f6-ba3e-46af-a3a6-7a2988d1f0e9")); +// // CHECK_DELETED_TOKENS_END - // LAST_TESTS (for sure) - QCOMPARE(loginSpy.count(), 1); // Checking multiple calls - QCOMPARE(loginRespSpy.count(), 1); - QCOMPARE(getNumOfSubjects(), numOfSubjects); - QCOMPARE(getNumOfTokens(), numOfTokens); +// // LAST_TESTS (for sure) +// QCOMPARE(loginSpy.count(), 1); // Checking multiple calls +// QCOMPARE(loginRespSpy.count(), 1); +// QCOMPARE(getNumOfSubjects(), numOfSubjects); +// QCOMPARE(getNumOfTokens(), numOfTokens); } void ComplexTest::fullSync() { - api->prepareDatabase(); + /* api->prepareDatabase(); api->loadDataFromColnod(); QSignalSpy spy(api, &SyncManager::dataDownloaded); spy.wait(timeout); @@ -125,23 +125,23 @@ void ComplexTest::fullSync() QSignalSpy processSpy(api, &SyncManager::dataUpdatedToColnod); processSpy.wait(timeout); QSignalSpy finish(api, &SyncManager::syncFinished); - finish.wait(timeout); + finish.wait(timeout); */ } void ComplexTest::syncLastUpdated() { - Logger::log("ahoj"); - api->loadDataFromColnod(); - QSignalSpy spy(api, &SyncManager::dataDownloaded); - spy.wait(timeout); - api->loadDataFromDB(); - api->syncDataFromColnodToDB(); - api->syncDataFromDBToColnod(); - QSignalSpy processSpy(api, &SyncManager::dataUpdatedToColnod); - processSpy.wait(timeout); - QSignalSpy finish(api, &SyncManager::syncFinished); - finish.wait(timeout); - qDebug() << "All right, at least should be."; +// Logger::log("ahoj"); +// api->loadDataFromColnod(); +// QSignalSpy spy(api, &SyncManager::dataDownloaded); +// spy.wait(timeout); +// api->loadDataFromDB(); +// api->syncDataFromColnodToDB(); +// api->syncDataFromDBToColnod(); +// QSignalSpy processSpy(api, &SyncManager::dataUpdatedToColnod); +// processSpy.wait(timeout); +// QSignalSpy finish(api, &SyncManager::syncFinished); +// finish.wait(timeout); +// qDebug() << "All right, at least should be."; } void ComplexTest::testingStuff() @@ -196,4 +196,4 @@ std::shared_ptr ComplexTest::getTestToken() return token; } -QTEST_MAIN(ComplexTest) +//QTEST_MAIN(ComplexTest) diff --git a/test/unitTests/unittest.h b/test/unitTests/unittest.h index 0b2b5fe..0e29652 100644 --- a/test/unitTests/unittest.h +++ b/test/unitTests/unittest.h @@ -44,6 +44,8 @@ private slots: private: + std::shared_ptr getTestToken(); + //QString host = "http://localhost:8080"; //colnod server (ssh -L 8080:192.168.254.11:8443 penta-master) QString host = "https://192.168.1.3:8443"; //local testing server QString password = "spaceti1";