From be8edccc37bb2ce0b17cc950129cd57d65aac49a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 18 Jun 2017 01:55:23 +0300 Subject: Fix unit tests after default theme was changed. --- src/utils/chatutils_unittest.cc | 1 + src/utils/translation/poparser_unittest.cc | 1 + src/utils/xml_unittest.cc | 7 ++++--- 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'src/utils') diff --git a/src/utils/chatutils_unittest.cc b/src/utils/chatutils_unittest.cc index cbe87da9d..d23e1331f 100644 --- a/src/utils/chatutils_unittest.cc +++ b/src/utils/chatutils_unittest.cc @@ -90,6 +90,7 @@ TEST_CASE("chatutils replaceVars", "") ConfigManager::initConfiguration(); getConfigDefaults2(config.getDefaultValues()); + branding.setDefaultValues(getBrandingDefaults()); gui = new Gui(); gui->postInit(mainGraphics); diff --git a/src/utils/translation/poparser_unittest.cc b/src/utils/translation/poparser_unittest.cc index 54dccb85b..f986c0f37 100644 --- a/src/utils/translation/poparser_unittest.cc +++ b/src/utils/translation/poparser_unittest.cc @@ -84,6 +84,7 @@ TEST_CASE("PoParser tests", "PoParser") ConfigManager::initConfiguration(); getConfigDefaults2(config.getDefaultValues()); + branding.setDefaultValues(getBrandingDefaults()); ActorSprite::load(); gui = new Gui(); diff --git a/src/utils/xml_unittest.cc b/src/utils/xml_unittest.cc index 1d4aa52cc..cd5346954 100644 --- a/src/utils/xml_unittest.cc +++ b/src/utils/xml_unittest.cc @@ -77,14 +77,15 @@ TEST_CASE("xml doc", "") graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE); #endif // USE_SDL2 - theme = new Theme; - Theme::selectSkin(); - Dirs::initRootDir(); Dirs::initHomeDir(); ConfigManager::initConfiguration(); getConfigDefaults2(config.getDefaultValues()); + branding.setDefaultValues(getBrandingDefaults()); + + theme = new Theme; + Theme::selectSkin(); const char *const tempXmlName = "tempxml.xml"; ActorSprite::load(); -- cgit v1.2.3-60-g2f50