summaryrefslogtreecommitdiff
path: root/src/unittests/resources
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/resources
parent75ca03c95c90064e67fa9eaddb4c609196dd3a27 (diff)
downloadmv-e826d4c63365dde4c988453846437dcb65370945.tar.gz
mv-e826d4c63365dde4c988453846437dcb65370945.tar.bz2
mv-e826d4c63365dde4c988453846437dcb65370945.tar.xz
mv-e826d4c63365dde4c988453846437dcb65370945.zip
Improve setting default values for configuration objects.
Diffstat (limited to 'src/unittests/resources')
-rw-r--r--src/unittests/resources/dye/dyepalette.cc6
-rw-r--r--src/unittests/resources/resourcemanager/resourcemanager.cc2
-rw-r--r--src/unittests/resources/sprite/animatedsprite.cc4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/unittests/resources/dye/dyepalette.cc b/src/unittests/resources/dye/dyepalette.cc
index 0e99e9871..9a64be1f5 100644
--- a/src/unittests/resources/dye/dyepalette.cc
+++ b/src/unittests/resources/dye/dyepalette.cc
@@ -95,13 +95,13 @@ TEST_CASE("DyePalette tests", "")
Dirs::initHomeDir();
ConfigManager::initConfiguration();
- getConfigDefaults2(config.getDefaultValues());
- branding.setDefaultValues(getBrandingDefaults());
+ setConfigDefaults2(config);
+ setBrandingDefaults(branding);
ActorSprite::load();
gui = new Gui();
gui->postInit(mainGraphics);
- paths.setDefaultValues(getPathsDefaults());
+ setPathsDefaults(paths);
PaletteDB::load();
SECTION("simple test 1")
diff --git a/src/unittests/resources/resourcemanager/resourcemanager.cc b/src/unittests/resources/resourcemanager/resourcemanager.cc
index cd67b10d8..3e3a188f2 100644
--- a/src/unittests/resources/resourcemanager/resourcemanager.cc
+++ b/src/unittests/resources/resourcemanager/resourcemanager.cc
@@ -130,7 +130,7 @@ TEST_CASE("resourcemanager", "resourcemanager")
ActorSprite::load();
// ConfigManager::initConfiguration();
-// getConfigDefaults2(config.getDefaultValues());
+// setConfigDefaults2(config);
while (ResourceManager::cleanOrphans(true))
continue;
diff --git a/src/unittests/resources/sprite/animatedsprite.cc b/src/unittests/resources/sprite/animatedsprite.cc
index 3e4a1826c..f05fd76dd 100644
--- a/src/unittests/resources/sprite/animatedsprite.cc
+++ b/src/unittests/resources/sprite/animatedsprite.cc
@@ -96,8 +96,8 @@ TEST_CASE("AnimatedSprite tests", "animatedsprite")
Dirs::initHomeDir();
ConfigManager::initConfiguration();
- getConfigDefaults2(config.getDefaultValues());
- branding.setDefaultValues(getBrandingDefaults());
+ setConfigDefaults2(config);
+ setBrandingDefaults(branding);
ActorSprite::load();
gui = new Gui();