diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-09-14 02:52:41 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-09-14 02:52:41 +0300 |
| commit | 4133ef1e7821cae6205d4ee5a8e3277eec9fe540 (patch) | |
| tree | 3666e5d95da67dbe7ef739b41f78170885be97d4 /src/unittests/utils/xmlutils.cc | |
| parent | bb980aaf7a61f8d0fe03f7def03795d5f5d8d2a0 (diff) | |
| download | manaverse-4133ef1e7821cae6205d4ee5a8e3277eec9fe540.tar.gz manaverse-4133ef1e7821cae6205d4ee5a8e3277eec9fe540.tar.bz2 manaverse-4133ef1e7821cae6205d4ee5a8e3277eec9fe540.tar.xz manaverse-4133ef1e7821cae6205d4ee5a8e3277eec9fe540.zip | |
Fix unit tests error with undefined config variable.
Diffstat (limited to 'src/unittests/utils/xmlutils.cc')
| -rw-r--r-- | src/unittests/utils/xmlutils.cc | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/src/unittests/utils/xmlutils.cc b/src/unittests/utils/xmlutils.cc index e665cb6e5..23df65a10 100644 --- a/src/unittests/utils/xmlutils.cc +++ b/src/unittests/utils/xmlutils.cc @@ -56,6 +56,12 @@ TEST_CASE("xmlutils readXmlIntVector 1", "") mainGraphics = new SDLGraphics; imageHelper = new SDLImageHelper(); + + Dirs::initHomeDir(); + + setBrandingDefaults(branding); + ConfigManager::initConfiguration(); + #ifdef USE_SDL2 SDLImageHelper::setRenderer(graphicsManager.createRenderer( graphicsManager.createWindow(640, 480, 0, @@ -68,11 +74,6 @@ TEST_CASE("xmlutils readXmlIntVector 1", "") userPalette = new UserPalette; Dirs::initRootDir(); - Dirs::initHomeDir(); - - setBrandingDefaults(branding); - ConfigManager::initConfiguration(); - theme = new Theme; Theme::selectSkin(); @@ -114,6 +115,13 @@ TEST_CASE("xmlutils readXmlStringMap 1", "") mainGraphics = new SDLGraphics; imageHelper = new SDLImageHelper(); + + Dirs::initRootDir(); + Dirs::initHomeDir(); + + setBrandingDefaults(branding); + ConfigManager::initConfiguration(); + #ifdef USE_SDL2 SDLImageHelper::setRenderer(graphicsManager.createRenderer( graphicsManager.createWindow(640, 480, 0, @@ -125,12 +133,6 @@ TEST_CASE("xmlutils readXmlStringMap 1", "") userPalette = new UserPalette; - Dirs::initRootDir(); - Dirs::initHomeDir(); - - setBrandingDefaults(branding); - ConfigManager::initConfiguration(); - theme = new Theme; Theme::selectSkin(); @@ -173,6 +175,13 @@ TEST_CASE("xmlutils readXmlIntMap 1", "") mainGraphics = new SDLGraphics; imageHelper = new SDLImageHelper(); + + Dirs::initRootDir(); + Dirs::initHomeDir(); + + setBrandingDefaults(branding); + ConfigManager::initConfiguration(); + #ifdef USE_SDL2 SDLImageHelper::setRenderer(graphicsManager.createRenderer( graphicsManager.createWindow(640, 480, 0, @@ -184,12 +193,6 @@ TEST_CASE("xmlutils readXmlIntMap 1", "") userPalette = new UserPalette; - Dirs::initRootDir(); - Dirs::initHomeDir(); - - setBrandingDefaults(branding); - ConfigManager::initConfiguration(); - theme = new Theme; Theme::selectSkin(); |