tests: move DiveComputer test from testpreferences

Remove DiveComputer test in testpreferences
add the same DiveComputer tests to testqPrefDiveComputer

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-07-22 17:47:17 +02:00 committed by Dirk Hohndel
parent bb5c1da1b7
commit 87b00aea2b
3 changed files with 32 additions and 21 deletions

View file

@ -466,27 +466,6 @@ void TestPreferences::testPreferences()
TEST(update->dontCheckForUpdates(), false);
TEST(update->lastVersionUsed(), QStringLiteral("tomaz-2"));
TEST(update->nextCheck(), date);
auto dc = pref->dive_computer_settings;
dc->set_device("TomazComputer");
TEST(dc->device(), QStringLiteral("TomazComputer"));
dc->set_device("Deepwater");
TEST(dc->device(), QStringLiteral("Deepwater"));
dc->set_download_mode(0);
TEST(dc->download_mode(), 0);
dc->set_download_mode(1);
TEST(dc->download_mode(), 1);
dc->set_product("Thingy1");
TEST(dc->product(), QStringLiteral("Thingy1"));
dc->set_product("Thingy2");
TEST(dc->product(), QStringLiteral("Thingy2"));
dc->set_vendor("Sharewater");
TEST(dc->vendor(), QStringLiteral("Sharewater"));
dc->set_vendor("OSTS");
TEST(dc->vendor(), QStringLiteral("OSTS"));
}
QTEST_MAIN(TestPreferences)

View file

@ -120,5 +120,36 @@ void TestQPrefDiveComputer::test_multiple()
QCOMPARE(tst->download_mode(), tst_direct->download_mode());
}
#define TEST(METHOD, VALUE) \
QCOMPARE(METHOD, VALUE); \
dc->sync(); \
dc->load(); \
QCOMPARE(METHOD, VALUE);
void TestQPrefDiveComputer::test_oldPreferences()
{
auto dc = qPrefDiveComputer::instance();
dc->set_device("TomazComputer");
TEST(dc->device(), QStringLiteral("TomazComputer"));
dc->set_device("Deepwater");
TEST(dc->device(), QStringLiteral("Deepwater"));
dc->set_download_mode(0);
TEST(dc->download_mode(), 0);
dc->set_download_mode(1);
TEST(dc->download_mode(), 1);
dc->set_product("Thingy1");
TEST(dc->product(), QStringLiteral("Thingy1"));
dc->set_product("Thingy2");
TEST(dc->product(), QStringLiteral("Thingy2"));
dc->set_vendor("Sharewater");
TEST(dc->vendor(), QStringLiteral("Sharewater"));
dc->set_vendor("OSTS");
TEST(dc->vendor(), QStringLiteral("OSTS"));
}
QTEST_MAIN(TestQPrefDiveComputer)

View file

@ -15,6 +15,7 @@ private slots:
void test_set_load_struct();
void test_struct_disk();
void test_multiple();
void test_oldPreferences();
};
#endif // TESTQPREFDIVECOMPUTER_H