diff options
Diffstat (limited to 'src/unittests/resources/dye')
-rw-r--r-- | src/unittests/resources/dye/dye.cc | 12 | ||||
-rw-r--r-- | src/unittests/resources/dye/dyepalette.cc | 15 |
2 files changed, 14 insertions, 13 deletions
diff --git a/src/unittests/resources/dye/dye.cc b/src/unittests/resources/dye/dye.cc index ada0f5d40..a0294a84f 100644 --- a/src/unittests/resources/dye/dye.cc +++ b/src/unittests/resources/dye/dye.cc @@ -1963,6 +1963,12 @@ TEST_CASE("Dye real dye", "") VirtFs::mountDirSilent("data/test", Append_false); VirtFs::mountDirSilent("../data/test", Append_false); + Dirs::initRootDir(); + Dirs::initHomeDir(); + + setBrandingDefaults(branding); + ConfigManager::initConfiguration(); + #ifdef USE_SDL2 imageHelper = new SurfaceImageHelper; @@ -1978,12 +1984,6 @@ TEST_CASE("Dye real dye", "") userPalette = new UserPalette; - Dirs::initRootDir(); - Dirs::initHomeDir(); - - setBrandingDefaults(branding); - ConfigManager::initConfiguration(); - theme = new Theme; Theme::selectSkin(); diff --git a/src/unittests/resources/dye/dyepalette.cc b/src/unittests/resources/dye/dyepalette.cc index 47f7266a4..e2632003a 100644 --- a/src/unittests/resources/dye/dyepalette.cc +++ b/src/unittests/resources/dye/dyepalette.cc @@ -67,6 +67,14 @@ TEST_CASE("DyePalette tests", "") mainGraphics = new SDLGraphics; imageHelper = new SDLImageHelper(); + + Dirs::initRootDir(); + Dirs::initHomeDir(); + + ConfigManager::initConfiguration(); + setConfigDefaults2(config); + setBrandingDefaults(branding); + #ifdef USE_SDL2 SDLImageHelper::setRenderer(graphicsManager.createRenderer( graphicsManager.createWindow(640, 480, 0, @@ -76,13 +84,6 @@ TEST_CASE("DyePalette tests", "") graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE); #endif // USE_SDL2 - Dirs::initRootDir(); - Dirs::initHomeDir(); - - ConfigManager::initConfiguration(); - setConfigDefaults2(config); - setBrandingDefaults(branding); - theme = new Theme; Theme::selectSkin(); |