mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-11 03:21:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

tests: move General test from testpreferences

Browse source 
Remove General test in testpreferences
add the same General tests to testqPrefGeneral

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-08-13 22:12:06 +02:00 committed by Dirk Hohndel
parent 4ba458318c
commit 91ec0fe8d4
3 changed files with 46 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
tests/testpreferences.cpp
View file

@ -23,42 +23,6 @@ void TestPreferences::testPreferences()
{ {
auto pref = SettingsObjectWrapper::instance(); auto pref = SettingsObjectWrapper::instance();
pref->load(); pref->load();
auto general = pref->general_settings;
general->setDefaultFilename("filename");
general->setDefaultCylinder("cylinder_2");
//TODOl: Change this to a enum. // This is 'undefined', it will need to figure out later between no_file or use_deault file.
general->set_default_file_behavior(LOCAL_DEFAULT_FILE);
general->set_defaultsetpoint(0);
general->set_o2consumption(0);
general->set_pscr_ratio(0);
general->set_use_default_file(true);
TEST(general->default_filename(), QStringLiteral("filename"));
TEST(general->default_cylinder(), QStringLiteral("cylinder_2"));
TEST(general->default_file_behavior(), LOCAL_DEFAULT_FILE); // since we have a default file, here it returns
TEST(general->defaultsetpoint(), 0);
TEST(general->o2consumption(), 0);
TEST(general->pscr_ratio(), 0);
TEST(general->use_default_file(), true);
general->set_default_filename("no_file_name");
general->set_default_cylinder("cylinder_1");
//TODOl: Change this to a enum.
general->set_default_file_behavior(CLOUD_DEFAULT_FILE);
general->set_defaultsetpoint(1);
general->set_o2consumption(1);
general->set_pscr_ratio(1);
general->set_use_default_file(false);
TEST(general->default_filename(), QStringLiteral("no_file_name"));
TEST(general->default_cylinder(), QStringLiteral("cylinder_1"));
TEST(general->default_file_behavior(), CLOUD_DEFAULT_FILE);
TEST(general->defaultsetpoint(), 1);
TEST(general->o2consumption(), 1);
TEST(general->pscr_ratio(), 1);
TEST(general->use_default_file(), false);
} }
QTEST_MAIN(TestPreferences) QTEST_MAIN(TestPreferences)

45
tests/testqPrefGeneral.cpp
View file

@ -181,4 +181,49 @@ void TestQPrefGeneral::test_multiple()
QCOMPARE(tst_direct->pscr_ratio(), 18); QCOMPARE(tst_direct->pscr_ratio(), 18);
} }
#define TEST(METHOD, VALUE) \
QCOMPARE(METHOD, VALUE); \
general->sync(); \
general->load(); \
QCOMPARE(METHOD, VALUE);
void TestQPrefGeneral::test_oldPreferences()
{
auto general = qPrefGeneral::instance();
general->set_default_filename("filename");
general->set_default_cylinder("cylinder_2");
general->set_default_file_behavior(LOCAL_DEFAULT_FILE);
general->set_defaultsetpoint(0);
general->set_o2consumption(0);
general->set_pscr_ratio(0);
general->set_use_default_file(true);
TEST(general->default_filename(), QStringLiteral("filename"));
TEST(general->default_cylinder(), QStringLiteral("cylinder_2"));
TEST(general->default_file_behavior(), LOCAL_DEFAULT_FILE); // since we have a default file, here it returns
TEST(general->defaultsetpoint(), 0);
TEST(general->o2consumption(), 0);
TEST(general->pscr_ratio(), 0);
TEST(general->use_default_file(), true);
general->set_default_filename("no_file_name");
general->set_default_cylinder("cylinder_1");
//TODOl: Change this to a enum.
general->set_default_file_behavior(CLOUD_DEFAULT_FILE);
general->set_defaultsetpoint(1);
general->set_o2consumption(1);
general->set_pscr_ratio(1);
general->set_use_default_file(false);
TEST(general->default_filename(), QStringLiteral("no_file_name"));
TEST(general->default_cylinder(), QStringLiteral("cylinder_1"));
TEST(general->default_file_behavior(), CLOUD_DEFAULT_FILE);
TEST(general->defaultsetpoint(), 1);
TEST(general->o2consumption(), 1);
TEST(general->pscr_ratio(), 1);
TEST(general->use_default_file(), false);
}
QTEST_MAIN(TestQPrefGeneral) QTEST_MAIN(TestQPrefGeneral)

1
tests/testqPrefGeneral.h
View file

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