Merge remote-tracking branch 'refs/remotes/origin/feat/unittest-syncmanager-adding-tests' into feat/unitest-syncmanager

This commit is contained in:
Ondřej Fischer 2019-12-03 16:10:50 +01:00
commit a19126588b

View File

@ -107,15 +107,36 @@ void SyncManagerTest::prepareData_tokens()
auto oldPreparedData = sync.prepareDataUsindOld(dbData, colnodData); auto oldPreparedData = sync.prepareDataUsindOld(dbData, colnodData);
auto newPreparedData = sync.prepareDataNew(dbData, colnodData); auto newPreparedData = sync.prepareDataNew(dbData, colnodData);
QVERIFY(newPreparedData->databaseData->updatedTokens.contains(expected_db_tokens_toupdate));
QVERIFY(newPreparedData->databaseData->deletedTokens.contains(expected_db_tokens_todelete));
QVERIFY(newPreparedData->colnodData->updatedTokens.contains(expected_colnod_tokens_toupdate));
QVERIFY(newPreparedData->colnodData->deletedTokens.contains(expected_colnod_tokens_todelete));
QVERIFY(oldPreparedData->databaseData->updatedTokens.contains(expected_db_tokens_toupdate)); auto testTokens = [=](const QSet<QString> &set, const QString &expectedId) {
QVERIFY(oldPreparedData->databaseData->deletedTokens.contains(expected_db_tokens_todelete)); if (expectedId.isEmpty()) {
QVERIFY(oldPreparedData->colnodData->updatedTokens.contains(expected_colnod_tokens_toupdate)); QVERIFY(set.isEmpty());
QVERIFY(oldPreparedData->colnodData->deletedTokens.contains(expected_colnod_tokens_todelete)); } else {
QVERIFY(set.contains(expectedId));
}
};
testTokens(newPreparedData->databaseData->updatedTokens.keys().toSet(), expected_db_tokens_toupdate);
testTokens(newPreparedData->databaseData->deletedTokens.toSet(), expected_db_tokens_todelete);
testTokens(newPreparedData->colnodData->updatedTokens.keys().toSet(), expected_colnod_tokens_toupdate);
testTokens(newPreparedData->colnodData->deletedTokens.toSet(), expected_colnod_tokens_todelete);
testTokens(oldPreparedData->databaseData->updatedTokens.keys().toSet(), expected_db_tokens_toupdate);
testTokens(oldPreparedData->databaseData->deletedTokens.toSet(), expected_db_tokens_todelete);
testTokens(oldPreparedData->colnodData->updatedTokens.keys().toSet(), expected_colnod_tokens_toupdate);
testTokens(oldPreparedData->colnodData->deletedTokens.toSet(), expected_colnod_tokens_todelete);
// QVERIFY(newPreparedData->databaseData->updatedTokens.contains(expected_db_tokens_toupdate));
// QVERIFY(newPreparedData->databaseData->deletedTokens.contains(expected_db_tokens_todelete));
// QVERIFY(newPreparedData->colnodData->updatedTokens.contains(expected_colnod_tokens_toupdate));
// QVERIFY(newPreparedData->colnodData->deletedTokens.contains(expected_colnod_tokens_todelete));
// QVERIFY(oldPreparedData->databaseData->updatedTokens.contains(expected_db_tokens_toupdate));
// QVERIFY(oldPreparedData->databaseData->deletedTokens.contains(expected_db_tokens_todelete));
// QVERIFY(oldPreparedData->colnodData->updatedTokens.contains(expected_colnod_tokens_toupdate));
// QVERIFY(oldPreparedData->colnodData->deletedTokens.contains(expected_colnod_tokens_todelete));
} }
@ -141,12 +162,13 @@ void SyncManagerTest::prepareData_tokens_data()
// in: id1 in database new/updated // in: id1 in database new/updated
// in: id1 deleted in colnod // in: id1 deleted in colnod
// out: 1 colnod token must be deleted from database // out: 1 colnod token must be deleted from database
QEXPECT_FAIL("delete 1 existing token in database", "Rare case, not sure if handling is needed", Continue);
QTest::newRow("delete 1 existing token in database") << "id1,20191010:23:23:00" << "" QTest::newRow("delete 1 existing token in database") << "id1,20191010:23:23:00" << ""
<< "" << "id1,20191010:23:23:00" << "" << "id1,20191010:23:23:00"
// expected database: toupdate << todelete // expected database: toupdate << todelete
<< "" << "id1" << "" << ""
// expected colnod: toupdate << todelete // expected colnod: toupdate << todelete
<< "" << ""; << "" << "id1";
} }
QTEST_MAIN(SyncManagerTest) QTEST_MAIN(SyncManagerTest)