blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 21:00:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make SettingsManager an object instead of a namespace

Browse source
This commit is contained in:
Dan Paulat 2023-10-06 05:05:59 -05:00
parent 1f964c49f8
commit 67881d31d5
5 changed files with 76 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/source/scwx/qt/manager/settings_manager.test.cpp
View file

@ -76,7 +76,7 @@ TEST_F(SettingsManagerTest, CreateJson)
// Verify file doesn't exist prior to test start
EXPECT_EQ(std::filesystem::exists(filename), false);
SettingsManager::ReadSettings(filename);
SettingsManager::Instance().ReadSettings(filename);
EXPECT_EQ(std::filesystem::exists(filename), true);
@ -92,7 +92,7 @@ TEST_F(SettingsManagerTest, SettingsKeax)
std::string filename(std::string(SCWX_TEST_DATA_DIR) +
"/json/settings/settings-keax.json");
SettingsManager::ReadSettings(filename);
SettingsManager::Instance().ReadSettings(filename);
EXPECT_EQ(
settings::GeneralSettings::Instance().default_radar_site().GetValue(),
@ -112,7 +112,7 @@ TEST_P(DefaultSettingsTest, DefaultSettings)
std::filesystem::copy_file(sourceFile, filename);
SettingsManager::ReadSettings(filename);
SettingsManager::Instance().ReadSettings(filename);
VerifyDefaults();
CompareFiles(filename, DEFAULT_SETTINGS_FILE);
@ -140,7 +140,7 @@ TEST_P(BadSettingsTest, BadSettings)
std::filesystem::copy_file(sourceFile, filename);
SettingsManager::ReadSettings(filename);
SettingsManager::Instance().ReadSettings(filename);
CompareFiles(filename, goodFile);