diff options
| author |  jan Iversen <jani@apache.org> | 2018-08-10 17:45:34 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-08-13 15:04:50 -0700 |
| commit | af2201545205d5bf0844a993b05950e6f12805dd (patch) | |
| tree | 9e368166d4a42e9d77974fbc25bc33313732fd42 /tests | |
| parent | 3cd698361c3c1a8c8f5e455799d954e76f68d6bc (diff) | |
| download | subsurface-af2201545205d5bf0844a993b05950e6f12805dd.tar.gz | |
core: activate qPrefGeocoding
remove Geocoding from SettingsObjectWrapper and reference qPrefFacebook
update files using SettingsObjectWrapper/Geocoding to use qPrefFacebook
this activated qPrefGeocoding and removed the similar class from
SettingsObjectWrapper.
Signed-off-by: Jan Iversen <jani@apache.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testpreferences.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/tests/testpreferences.cpp b/tests/testpreferences.cpp index 85534ccee..92e0596ef 100644 --- a/tests/testpreferences.cpp +++ b/tests/testpreferences.cpp @@ -57,22 +57,22 @@ void TestPreferences::testPreferences() TEST(pp->po2ThresholdMin(), 4.0); TEST(pp->po2ThresholdMax(), 5.0); - auto geo = pref->geocoding; - geo->setFirstTaxonomyCategory(TC_NONE); - geo->setSecondTaxonomyCategory(TC_OCEAN); - geo->setThirdTaxonomyCategory(TC_COUNTRY); - - TEST(geo->firstTaxonomyCategory(), TC_NONE); - TEST(geo->secondTaxonomyCategory(), TC_OCEAN); - TEST(geo->thirdTaxonomyCategory(), TC_COUNTRY); - - geo->setFirstTaxonomyCategory(TC_OCEAN); - geo->setSecondTaxonomyCategory(TC_COUNTRY); - geo->setThirdTaxonomyCategory(TC_NONE); - - TEST(geo->firstTaxonomyCategory(), TC_OCEAN); - TEST(geo->secondTaxonomyCategory(), TC_COUNTRY); - TEST(geo->thirdTaxonomyCategory(), TC_NONE); + auto geo = qPrefGeocoding::instance(); + geo->set_first_taxonomy_category(TC_NONE); + geo->set_second_taxonomy_category(TC_OCEAN); + geo->set_third_taxonomy_category(TC_COUNTRY); + + TEST(geo->first_taxonomy_category(), TC_NONE); + TEST(geo->second_taxonomy_category(), TC_OCEAN); + TEST(geo->third_taxonomy_category(), TC_COUNTRY); + + geo->set_first_taxonomy_category(TC_OCEAN); + geo->set_second_taxonomy_category(TC_COUNTRY); + geo->set_third_taxonomy_category(TC_NONE); + + TEST(geo->first_taxonomy_category(), TC_OCEAN); + TEST(geo->second_taxonomy_category(), TC_COUNTRY); + TEST(geo->third_taxonomy_category(), TC_NONE); auto general = pref->general_settings; general->setDefaultFilename("filename"); |