diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-06-18 01:55:23 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-06-18 01:55:23 +0300 |
| commit | be8edccc37bb2ce0b17cc950129cd57d65aac49a (patch) | |
| tree | 00badff35ec2ea5797043ec2b4bcec5496c883e2 /src/utils | |
| parent | 91cd49664d1dbe1bdea78541fcdf4bd3ec94f22a (diff) | |
| download | ManaVerse-be8edccc37bb2ce0b17cc950129cd57d65aac49a.tar.gz ManaVerse-be8edccc37bb2ce0b17cc950129cd57d65aac49a.tar.bz2 ManaVerse-be8edccc37bb2ce0b17cc950129cd57d65aac49a.tar.xz ManaVerse-be8edccc37bb2ce0b17cc950129cd57d65aac49a.zip | |
Fix unit tests after default theme was changed.
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/chatutils_unittest.cc | 1 | ||||
| -rw-r--r-- | src/utils/translation/poparser_unittest.cc | 1 | ||||
| -rw-r--r-- | src/utils/xml_unittest.cc | 7 |
3 files changed, 6 insertions, 3 deletions
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(); |