diff options
| -rw-r--r-- | tests/testpreferences.cpp | 20 | ||||
| -rw-r--r-- | tests/testqPrefUpdateManager.cpp | 29 | ||||
| -rw-r--r-- | tests/testqPrefUpdateManager.h | 1 |
3 files changed, 30 insertions, 20 deletions
diff --git a/tests/testpreferences.cpp b/tests/testpreferences.cpp index 59f7d064c..aef4c9991 100644 --- a/tests/testpreferences.cpp +++ b/tests/testpreferences.cpp @@ -262,26 +262,6 @@ void TestPreferences::testPreferences() TEST(location->timeThreshold(), 30); TEST(location->distanceThreshold(), 40); - - auto update = qPrefUpdateManager::instance(); - QDate date = QDate::currentDate(); - - update->set_dont_check_for_updates(true); - update->set_last_version_used("tomaz-1"); - update->set_next_check(date); - - TEST(update->dont_check_for_updates(), true); - TEST(update->last_version_used(), QStringLiteral("tomaz-1")); - TEST(update->next_check(), date); - - date = date.addDays(3); - update->set_dont_check_for_updates(false); - update->set_last_version_used("tomaz-2"); - update->set_next_check(date); - - TEST(update->dont_check_for_updates(), false); - TEST(update->last_version_used(), QStringLiteral("tomaz-2")); - TEST(update->next_check(), date); } QTEST_MAIN(TestPreferences) diff --git a/tests/testqPrefUpdateManager.cpp b/tests/testqPrefUpdateManager.cpp index 63757eaab..166fea032 100644 --- a/tests/testqPrefUpdateManager.cpp +++ b/tests/testqPrefUpdateManager.cpp @@ -120,4 +120,33 @@ void TestQPrefUpdateManager::test_multiple() QCOMPARE(tst_direct->dont_check_exists(), false); } +#define TEST(METHOD, VALUE) \ + QCOMPARE(METHOD, VALUE); \ + update->sync(); \ + update->load(); \ + QCOMPARE(METHOD, VALUE); + +void TestQPrefUpdateManager::test_oldPreferences() +{ + auto update = qPrefUpdateManager::instance(); + QDate date = QDate::currentDate(); + + update->set_dont_check_for_updates(true); + update->set_last_version_used("tomaz-1"); + update->set_next_check(date); + + TEST(update->dont_check_for_updates(), true); + TEST(update->last_version_used(), QStringLiteral("tomaz-1")); + TEST(update->next_check(), date); + + date = date.addDays(3); + update->set_dont_check_for_updates(false); + update->set_last_version_used("tomaz-2"); + update->set_next_check(date); + + TEST(update->dont_check_for_updates(), false); + TEST(update->last_version_used(), QStringLiteral("tomaz-2")); + TEST(update->next_check(), date); +} + QTEST_MAIN(TestQPrefUpdateManager) diff --git a/tests/testqPrefUpdateManager.h b/tests/testqPrefUpdateManager.h index 6c8f04dbf..5dc58e0d2 100644 --- a/tests/testqPrefUpdateManager.h +++ b/tests/testqPrefUpdateManager.h @@ -14,6 +14,7 @@ private slots: void test_set_load_struct(); void test_struct_disk(); void test_multiple(); + void test_oldPreferences(); }; #endif // TESTQPREFUPDATEMANAGER_H |