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

unittest: adding multiple checks for prepareData_test

Browse Source
This commit is contained in:
Filip Bucek 2019-12-02 13:18:46 +01:00
parent 9afde747c8
commit f3077d9f0a
3 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/colnod/syncmanager.cpp
View File

@ -204,6 +204,8 @@ std::unique_ptr<PreparedData> SyncManager::prepareDataNew(const std::shared_ptr<
void SyncManager::initNewToken(const std::shared_ptr<Token>& token)
{
Q_ASSERT(database);
Q_ASSERT(token);
qint16 num = database->getNumOfTokensOfSubject(token->subjectId());
token->setName(database->getSubjectNameByTokenId(token->id()) + "_mobile_" + QString::number(num + 1));
token->setDescription("mobile");
@ -214,9 +216,6 @@ void SyncManager::initNewToken(const std::shared_ptr<Token>& token)
std::unique_ptr<PreparedData> SyncManager::prepareDataUsindOld(const std::shared_ptr<Data> &databaseData, const std::shared_ptr<Data> &colnodData)
{
Q_UNUSED(databaseData);
Q_UNUSED(colnodData);
qInfo(syncmanager) << equals;
qInfo(syncmanager) << "PREPARING DATA -> BEGIN";
qInfo(syncmanager) << dash;

15
test/auto/colnod/tst_colnodapi.cpp
View File

@ -21,6 +21,7 @@ private slots:
void login();
void getTokens();
void download_data_test();
void download_data_test_now();
void download_data_fail_test();
private:
@ -60,7 +61,7 @@ void ColnodTest::download_data_test()
{
serversdk::RequestManager reqMan;
ColnodAPI colnod(&reqMan);
{
QSignalSpy spy(&colnod, &ColnodAPI::downloadDataFinished);
QVERIFY(spy.isValid());
colnod.downloadData(Timestamp(1570190399259));
@ -71,8 +72,13 @@ void ColnodTest::download_data_test()
QVERIFY(! data->updatedTokens.isEmpty());
QVERIFY(data->updatedTokens.contains("5e2f1260-da1c-441f-9644-24dfe3b97b2a"));
}
{
}
void ColnodTest::download_data_test_now()
{
serversdk::RequestManager reqMan;
ColnodAPI colnod(&reqMan);
Timestamp time(QDateTime::currentMSecsSinceEpoch());
colnod.downloadData(time);
QSignalSpy spy(&colnod, &ColnodAPI::downloadDataFinished);
@ -80,8 +86,7 @@ void ColnodTest::download_data_test()
auto data = qvariant_cast<std::shared_ptr<Data>>(spy.at(0).at(0));
QVERIFY(data);
QVERIFY(! data->updatedTokens.isEmpty());
}
QVERIFY(data->updatedTokens.isEmpty());
}
void ColnodTest::download_data_fail_test()

17
test/auto/syncmanager/tst_syncmanager.cpp
View File

@ -25,12 +25,21 @@ void SyncManagerTest::prepareData_test()
auto dbData = std::make_shared<Data>();
auto colnodData = std::make_shared<Data>();
auto token = std::make_shared<Token>();
token->setId("id1");
dbData->updatedTokens.insert("id1", token);
auto oldPreparedData = sync.prepareDataUsindOld(dbData, colnodData);
auto newPreparedData = sync.prepareDataNew(dbData, colnodData);
QCOMPARE(newPreparedData, oldPreparedData);
QVERIFY(oldPreparedData->databaseData->updatedTokens.contains("id1"));
QVERIFY(newPreparedData->databaseData->updatedTokens.contains("id1"));
QVERIFY(oldPreparedData->databaseData->updatedSubjects.isEmpty());
QVERIFY(newPreparedData->databaseData->updatedSubjects.isEmpty());
QVERIFY(oldPreparedData->databaseData->deletedTokens.isEmpty());
QVERIFY(newPreparedData->databaseData->deletedTokens.isEmpty());
QVERIFY(oldPreparedData->databaseData->deletedSubjects.isEmpty());
QVERIFY(newPreparedData->databaseData->deletedSubjects.isEmpty());
}
QTEST_MAIN(SyncManagerTest)