ondra/colnod-connector
1
0
Fork 1
mirror of https://gitlab.com/spaceti-app/integrations/acs/colnod-connector.git synced 2026-07-12 19:10:35 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into 'sync'

Browse Source 
# Conflicts:
#   src/colnod/requestmanager.cpp
#   test/unitTests/complextest.cpp
#   test/unitTests/complextest.h
This commit is contained in:
Ondřej Fischer 2019-11-07 08:03:18 +00:00
commit a5e4e89c01
3 changed files with 115 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/colnod/requestmanager.cpp
View File

@ -9,7 +9,11 @@ RequestManager::RequestManager()
std::shared_ptr<Response> RequestManager::login() std::shared_ptr<Response> RequestManager::login()
{ {
Q_ASSERT(!loginResponse); Q_ASSERT(!loginResponse);
<<<<<<< src/colnod/requestmanager.cpp
loginResponse = std::make_shared<Response>(); loginResponse = std::make_shared<Response>();
=======
loginResponse = new Response;
>>>>>>> src/colnod/requestmanager.cpp
QNetworkRequest request; QNetworkRequest request;
QString hash = encryptedPassword(this->password); QString hash = encryptedPassword(this->password);
authHeader = getLoginHeader(this->user, hash); authHeader = getLoginHeader(this->user, hash);

106
test/unitTests/complextest.cpp
View File

@ -2,6 +2,7 @@
void ComplexTest::initTestCase() void ComplexTest::initTestCase()
{ {
<<<<<<< test/unitTests/complextest.cpp
// auto reqMan1 = new RequestManager; // auto reqMan1 = new RequestManager;
// QList<QString> ids; // QList<QString> ids;
// ids.append("582c982d-6fd7-4856-8548-7ce542791c7a"); // ids.append("582c982d-6fd7-4856-8548-7ce542791c7a");
@ -12,6 +13,17 @@ void ComplexTest::initTestCase()
// deleteTokensRespSpy.wait(timeout); // deleteTokensRespSpy.wait(timeout);
// QTest::qWait(2500); // QTest::qWait(2500);
// Logger *logger = Logger::getLogger(); // Logger *logger = Logger::getLogger();
=======
auto reqMan1 = new RequestManager;
QList<QString> ids;
ids.append("582c982d-6fd7-4856-8548-7ce542791c7a");
ids.append("3ff23b41-3da3-4b33-82ce-d8e2d8c9a546");
Response* deleteTokensResp = reqMan1->deleteTokens(&ids);
QSignalSpy deleteTokensRespSpy(deleteTokensResp, &Response::ready);
QCOMPARE(deleteTokensRespSpy.count(), 0);
deleteTokensRespSpy.wait(10000);
QTest::qWait(2500);
>>>>>>> test/unitTests/complextest.cpp
start = QDateTime::currentMSecsSinceEpoch()-2000; start = QDateTime::currentMSecsSinceEpoch()-2000;
api = new SyncManager(); api = new SyncManager();
qDebug() << start; qDebug() << start;
@ -21,6 +33,7 @@ void ComplexTest::initTestCase()
void ComplexTest::cleanupTestCase() void ComplexTest::cleanupTestCase()
{ {
<<<<<<< test/unitTests/complextest.cpp
// QList<QString> ids; // QList<QString> ids;
// ids.append("582c982d-6fd7-4856-8548-7ce542791c7a"); // ids.append("582c982d-6fd7-4856-8548-7ce542791c7a");
// ids.append("3ff23b41-3da3-4b33-82ce-d8e2d8c9a546"); // ids.append("3ff23b41-3da3-4b33-82ce-d8e2d8c9a546");
@ -30,10 +43,22 @@ void ComplexTest::cleanupTestCase()
// QCOMPARE(deleteTokensRespSpy.count(), 0); // QCOMPARE(deleteTokensRespSpy.count(), 0);
// deleteTokensRespSpy.wait(timeout); // deleteTokensRespSpy.wait(timeout);
// QCOMPARE(deleteTokensRespSpy.count(), 1); // QCOMPARE(deleteTokensRespSpy.count(), 1);
=======
QList<QString> ids;
ids.append("582c982d-6fd7-4856-8548-7ce542791c7a");
ids.append("3ff23b41-3da3-4b33-82ce-d8e2d8c9a546");
auto reqMan = new RequestManager;
Response* deleteTokensResp = reqMan->deleteTokens(&ids);
QSignalSpy deleteTokensRespSpy(deleteTokensResp, &Response::ready);
QCOMPARE(deleteTokensRespSpy.count(), 0);
deleteTokensRespSpy.wait(10000);
QCOMPARE(deleteTokensRespSpy.count(), 1);
>>>>>>> test/unitTests/complextest.cpp
} }
void ComplexTest::complexTest() void ComplexTest::complexTest()
{ {
<<<<<<< test/unitTests/complextest.cpp
// // LOGIN_BEGIN // // LOGIN_BEGIN
// reqMan = new RequestManager; // reqMan = new RequestManager;
// QSignalSpy loginSpy(reqMan, &RequestManager::successLogin); // QSignalSpy loginSpy(reqMan, &RequestManager::successLogin);
@ -111,6 +136,87 @@ void ComplexTest::complexTest()
// QCOMPARE(loginRespSpy.count(), 1); // QCOMPARE(loginRespSpy.count(), 1);
// QCOMPARE(getNumOfSubjects(), numOfSubjects); // QCOMPARE(getNumOfSubjects(), numOfSubjects);
// QCOMPARE(getNumOfTokens(), numOfTokens); // QCOMPARE(getNumOfTokens(), numOfTokens);
=======
// LOGIN_BEGIN
reqMan = new RequestManager;
QSignalSpy loginSpy(reqMan, &RequestManager::successLogin);
QVERIFY(reqMan);
Response* loginResp = reqMan->login();
QSignalSpy loginRespSpy(loginResp, &Response::ready);
QCOMPARE(loginSpy.count(), 0);
QCOMPARE(loginRespSpy.count(), 0);
loginSpy.wait(10000);
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
// ADD_TOKENS_CHECK_BEGIN
QList<QPointer<Token>> tokens;
tokens.append(getTestToken());
Response* setTokensResp = reqMan->setTokens(&tokens);
QSignalSpy setTokensRespSpy(setTokensResp, &Response::ready);
QCOMPARE(setTokensRespSpy.count(), 0);
setTokensRespSpy.wait(10000);
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(10000);
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<QString> ids;
ids.append("582c982d-6fd7-4856-8548-7ce542791c7a");
Response* deleteTokensResp = reqMan->deleteTokens(&ids);
QSignalSpy deleteTokensRespSpy(deleteTokensResp, &Response::ready);
QCOMPARE(deleteTokensRespSpy.count(), 0);
deleteTokensRespSpy.wait(10000);
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(10000);
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("582c982d-6fd7-4856-8548-7ce542791c7a"));
// 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);
>>>>>>> test/unitTests/complextest.cpp
} }
void ComplexTest::fullSync() void ComplexTest::fullSync()

6
test/unitTests/complextest.h
View File

@ -32,10 +32,14 @@ private:
QString host = "https://192.168.1.3"; QString host = "https://192.168.1.3";
QString user = "spaceti"; QString user = "spaceti";
QString password = "spaceti1"; QString password = "spaceti1";
RequestManager* reqMan = nullptr;
uint64_t start = 0; uint64_t start = 0;
<<<<<<< test/unitTests/complextest.h
SyncManager* api = nullptr; SyncManager* api = nullptr;
static constexpr qint16 timeout = 10000; static constexpr qint16 timeout = 10000;
=======
RequestManager* reqMan = nullptr;
ColnodAPI* api = nullptr;
>>>>>>> test/unitTests/complextest.h
}; };