diff --git a/server-sdk b/server-sdk index 2041fed..a818055 160000 --- a/server-sdk +++ b/server-sdk @@ -1 +1 @@ -Subproject commit 2041fed9fab14658ceb574edaf5e4d31ed81e23a +Subproject commit a818055b75dc0de97e26be44cbbfd2e94516c09e diff --git a/src/colnod/colnodapi.cpp b/src/colnod/colnodapi.cpp index f3cee3c..55d818e 100644 --- a/src/colnod/colnodapi.cpp +++ b/src/colnod/colnodapi.cpp @@ -261,6 +261,7 @@ void ColnodAPI::areDataReady(std::shared_ptr data) qInfo(colnod) << tab << tab << data->deletedSubjects.size() << "SUBJECTS DELETED"; qInfo(colnod) << dash; + amountData = 0; emit downloadDataFinished(data); } } diff --git a/test/auto/colnod/tst_colnodapi.cpp b/test/auto/colnod/tst_colnodapi.cpp index 3e93a5b..b6e39c9 100644 --- a/test/auto/colnod/tst_colnodapi.cpp +++ b/test/auto/colnod/tst_colnodapi.cpp @@ -60,13 +60,27 @@ void ColnodTest::download_data_test() { serversdk::RequestManager reqMan; ColnodAPI colnod(&reqMan); + { + QSignalSpy spy(&colnod, &ColnodAPI::downloadDataFinished); + colnod.downloadData(Timestamp(0)); + QVERIFY(spy.wait()); - Timestamp time(QDateTime::currentMSecsSinceEpoch()); - colnod.downloadData(time); - QSignalSpy spy(&colnod, &ColnodAPI::downloadDataFinished); - QVERIFY(spy.wait()); - auto data = qvariant_cast>(spy.at(0).at(0)); - QVERIFY(data); + auto data = qvariant_cast>(spy.at(0).at(0)); + QVERIFY(data); + + QVERIFY(data->updatedTokens.size() > 0); + QVERIFY(data->updatedTokens.contains("6c907a42-0401-4403-8af4-9d58eb35cddc")); + } + { + Timestamp time(QDateTime::currentMSecsSinceEpoch()); + colnod.downloadData(time); + QSignalSpy spy(&colnod, &ColnodAPI::downloadDataFinished); + QVERIFY(spy.wait()); + auto data = qvariant_cast>(spy.at(0).at(0)); + QVERIFY(data); + + QVERIFY(data->updatedTokens.size() == 0); + } } void ColnodTest::download_data_fail_test() @@ -82,7 +96,7 @@ void ColnodTest::download_data_fail_test() auto data = qvariant_cast>(spy.at(0).at(0)); - QVERIFY(!data); + } QString ColnodTest::getLoginToken(ColnodAPI &colnod)