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

Inheriting MapSettings and PaletteSettings from SettingsCategory, updating SettingsManager initialization

Browse source
This commit is contained in:
Dan Paulat 2022-12-18 08:44:31 -06:00
parent c93e776137
commit 891b6c839f
14 changed files with 231 additions and 269 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -36,13 +36,13 @@ class BadSettingsTest :
void VerifyDefaults()
{
std::shared_ptr<settings::GeneralSettings> defaultGeneralSettings =
std::make_shared<settings::GeneralSettings>();
std::shared_ptr<settings::PaletteSettings> defaultPaletteSettings =
settings::PaletteSettings::Create();
settings::GeneralSettings defaultGeneralSettings {};
settings::MapSettings defaultMapSettings {};
settings::PaletteSettings defaultPaletteSettings {};
EXPECT_EQ(*defaultGeneralSettings, *SettingsManager::general_settings());
EXPECT_EQ(*defaultPaletteSettings, *SettingsManager::palette_settings());
EXPECT_EQ(defaultGeneralSettings, SettingsManager::general_settings());
EXPECT_EQ(defaultMapSettings, SettingsManager::map_settings());
EXPECT_EQ(defaultPaletteSettings, SettingsManager::palette_settings());
}
void CompareFiles(const std::string& file1, const std::string& file2)
@ -85,10 +85,10 @@ TEST_F(SettingsManagerTest, SettingsKeax)
SettingsManager::ReadSettings(filename);
EXPECT_EQ(SettingsManager::general_settings()->default_radar_site(), "KEAX");
for (size_t i = 0; i < SettingsManager::map_settings()->count(); ++i)
EXPECT_EQ(SettingsManager::general_settings().default_radar_site(), "KEAX");
for (size_t i = 0; i < SettingsManager::map_settings().count(); ++i)
{
EXPECT_EQ(SettingsManager::map_settings()->radar_site(i), "KEAX");
EXPECT_EQ(SettingsManager::map_settings().radar_site(i), "KEAX");
}
}