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

tests: move Language test from testpreferences

Browse source 
Remove Language test in testpreferences
add the same Language tests to testqPrefLanguage

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-08-08 21:11:33 +02:00 committed by Dirk Hohndel
parent dfa3f5e0e7
commit 526c1324fc
3 changed files with 48 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
tests/testpreferences.cpp
View file

@ -109,43 +109,6 @@ void TestPreferences::testPreferences()
TEST(general->o2Consumption(), 1); TEST(general->o2Consumption(), 1);
TEST(general->pscrRatio(), 1); TEST(general->pscrRatio(), 1);
TEST(general->useDefaultFile(), false); TEST(general->useDefaultFile(), false);
auto language = qPrefLanguage::instance();
language->set_lang_locale("en_US");
language->set_language("en");
language->set_time_format("hh:mm");
language->set_date_format("dd/mm/yy");
language->set_date_format_short("dd/mm");
language->set_time_format_override(false);
language->set_date_format_override(false);
language->set_use_system_language(false);
TEST(language->lang_locale(), QStringLiteral("en_US"));
TEST(language->language(), QStringLiteral("en"));
TEST(language->time_format(), QStringLiteral("hh:mm"));
TEST(language->date_format(), QStringLiteral("dd/mm/yy"));
TEST(language->date_format_short(), QStringLiteral("dd/mm"));
TEST(language->time_format_override(), false);
TEST(language->date_format_override(), false);
TEST(language->use_system_language(), false);
language->set_lang_locale("en_EN");
language->set_language("br");
language->set_time_format("mm:hh");
language->set_date_format("yy/mm/dd");
language->set_date_format_short("dd/yy");
language->set_time_format_override(true);
language->set_date_format_override(true);
language->set_use_system_language(true);
TEST(language->lang_locale(), QStringLiteral("en_EN"));
TEST(language->language(), QStringLiteral("br"));
TEST(language->time_format(), QStringLiteral("mm:hh"));
TEST(language->date_format(), QStringLiteral("yy/mm/dd"));
TEST(language->date_format_short(), QStringLiteral("dd/yy"));
TEST(language->time_format_override(), true);
TEST(language->date_format_override(), true);
TEST(language->use_system_language(), true);
} }
QTEST_MAIN(TestPreferences) QTEST_MAIN(TestPreferences)

47
tests/testqPrefLanguage.cpp
View file

@ -151,4 +151,51 @@ void TestQPrefLanguage::test_multiple()
QCOMPARE(tst_direct->time_format_override(), true); QCOMPARE(tst_direct->time_format_override(), true);
} }
#define TEST(METHOD, VALUE) \
QCOMPARE(METHOD, VALUE); \
language->sync(); \
language->load(); \
QCOMPARE(METHOD, VALUE);
void TestQPrefLanguage::test_oldPreferences()
{
auto language = qPrefLanguage::instance();
language->set_lang_locale("en_US");
language->set_language("en");
language->set_time_format("hh:mm");
language->set_date_format("dd/mm/yy");
language->set_date_format_short("dd/mm");
language->set_time_format_override(false);
language->set_date_format_override(false);
language->set_use_system_language(false);
TEST(language->lang_locale(), QStringLiteral("en_US"));
TEST(language->language(), QStringLiteral("en"));
TEST(language->time_format(), QStringLiteral("hh:mm"));
TEST(language->date_format(), QStringLiteral("dd/mm/yy"));
TEST(language->date_format_short(), QStringLiteral("dd/mm"));
TEST(language->time_format_override(), false);
TEST(language->date_format_override(), false);
TEST(language->use_system_language(), false);
language->set_lang_locale("en_EN");
language->set_language("br");
language->set_time_format("mm:hh");
language->set_date_format("yy/mm/dd");
language->set_date_format_short("dd/yy");
language->set_time_format_override(true);
language->set_date_format_override(true);
language->set_use_system_language(true);
TEST(language->lang_locale(), QStringLiteral("en_EN"));
TEST(language->language(), QStringLiteral("br"));
TEST(language->time_format(), QStringLiteral("mm:hh"));
TEST(language->date_format(), QStringLiteral("yy/mm/dd"));
TEST(language->date_format_short(), QStringLiteral("dd/yy"));
TEST(language->time_format_override(), true);
TEST(language->date_format_override(), true);
TEST(language->use_system_language(), true);
}
QTEST_MAIN(TestQPrefLanguage) QTEST_MAIN(TestQPrefLanguage)

1
tests/testqPrefLanguage.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 // TESTQPREFLANGUAGE_H #endif // TESTQPREFLANGUAGE_H