diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-08-31 01:34:38 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-08-31 01:34:38 +0300 |
| commit | e826d4c63365dde4c988453846437dcb65370945 (patch) | |
| tree | 1bd23d4694c06d97e7e8c885253c0100fe6142b9 /src/unittests/gui/windowmanager.cc | |
| parent | 75ca03c95c90064e67fa9eaddb4c609196dd3a27 (diff) | |
| download | plus-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/windowmanager.cc')
| -rw-r--r-- | src/unittests/gui/windowmanager.cc | 12 |
1 files changed, 6 insertions, 6 deletions
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), |