summaryrefslogtreecommitdiff
path: root/src/unittests/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-08-31 01:34:38 +0300
committerAndrei Karas <akaras@inbox.ru>2017-08-31 01:34:38 +0300
commite826d4c63365dde4c988453846437dcb65370945 (patch)
tree1bd23d4694c06d97e7e8c885253c0100fe6142b9 /src/unittests/gui
parent75ca03c95c90064e67fa9eaddb4c609196dd3a27 (diff)
downloadplus-e826d4c63365dde4c988453846437dcb65370945.tar.gz
plus-e826d4c63365dde4c988453846437dcb65370945.tar.bz2
plus-e826d4c63365dde4c988453846437dcb65370945.tar.xz
plus-e826d4c63365dde4c988453846437dcb65370945.zip
Improve setting default values for configuration objects.
Diffstat (limited to 'src/unittests/gui')
-rw-r--r--src/unittests/gui/widgets/browserbox.cc4
-rw-r--r--src/unittests/gui/windowmanager.cc12
2 files changed, 8 insertions, 8 deletions
diff --git a/src/unittests/gui/widgets/browserbox.cc b/src/unittests/gui/widgets/browserbox.cc
index 128c7a52c..8f97a6984 100644
--- a/src/unittests/gui/widgets/browserbox.cc
+++ b/src/unittests/gui/widgets/browserbox.cc
@@ -83,8 +83,8 @@ TEST_CASE("BrowserBox tests", "browserbox")
Dirs::initHomeDir();
ConfigManager::initConfiguration();
- getConfigDefaults2(config.getDefaultValues());
- branding.setDefaultValues(getBrandingDefaults());
+ setConfigDefaults2(config);
+ setBrandingDefaults(branding);
ActorSprite::load();
gui = new Gui();
diff --git a/src/unittests/gui/windowmanager.cc b/src/unittests/gui/windowmanager.cc
index 6a215d081..0bf21a97d 100644
--- a/src/unittests/gui/windowmanager.cc
+++ b/src/unittests/gui/windowmanager.cc
@@ -162,7 +162,7 @@ TEST_CASE("Windows tests", "windowmanager")
VirtFs::mountDirSilent("../data", Append_false);
VirtFs::mountDirSilent("data/test", Append_false);
VirtFs::mountDirSilent("../data/test", Append_false);
- paths.setDefaultValues(getPathsDefaults());
+ setPathsDefaults(paths);
branding.setValue("onlineServerFile", "test/serverlistplus.xml");
mainGraphics = new SDLGraphics;
imageHelper = new SDLImageHelper;
@@ -188,8 +188,8 @@ TEST_CASE("Windows tests", "windowmanager")
::remove(cfgName.c_str());
ConfigManager::initConfiguration();
- getConfigDefaults2(config.getDefaultValues());
- branding.setDefaultValues(getBrandingDefaults());
+ setConfigDefaults2(config);
+ setBrandingDefaults(branding);
ConfigManager::initServerConfig("nonexistserver");
localPlayer = new LocalPlayer(static_cast<BeingId>(1),
@@ -845,7 +845,7 @@ TEST_CASE("WindowManager", "create windows")
VirtFs::mountDirSilent("../data", Append_false);
VirtFs::mountDirSilent("data/test", Append_false);
VirtFs::mountDirSilent("../data/test", Append_false);
- paths.setDefaultValues(getPathsDefaults());
+ setPathsDefaults(paths);
branding.setValue("onlineServerFile", "test/serverlistplus.xml");
mainGraphics = new SDLGraphics;
imageHelper = new SDLImageHelper;
@@ -870,8 +870,8 @@ TEST_CASE("WindowManager", "create windows")
::remove(cfgName.c_str());
ConfigManager::initConfiguration();
- getConfigDefaults2(config.getDefaultValues());
- branding.setDefaultValues(getBrandingDefaults());
+ setConfigDefaults2(config);
+ setBrandingDefaults(branding);
ConfigManager::initServerConfig("nonexistserver");
localPlayer = new LocalPlayer(static_cast<BeingId>(1),