diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-09-01 04:05:51 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-09-01 04:05:51 +0300 |
| commit | 59d9b799fa5bf3c8ba99cc6f703b83751f1d3497 (patch) | |
| tree | 16b29e2afda9f223f36e6a7d3f4659fb72d3d7e6 /src/unittests/resources/sdlimagehelper.cc | |
| parent | b9ce7a70632f31a3a4b29841ab034dbb297b295d (diff) | |
| download | mv-59d9b799fa5bf3c8ba99cc6f703b83751f1d3497.tar.gz mv-59d9b799fa5bf3c8ba99cc6f703b83751f1d3497.tar.bz2 mv-59d9b799fa5bf3c8ba99cc6f703b83751f1d3497.tar.xz mv-59d9b799fa5bf3c8ba99cc6f703b83751f1d3497.zip | |
Fix unit tests after last changes in configuration.cpp
Diffstat (limited to 'src/unittests/resources/sdlimagehelper.cc')
| -rw-r--r-- | src/unittests/resources/sdlimagehelper.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/unittests/resources/sdlimagehelper.cc b/src/unittests/resources/sdlimagehelper.cc index fa897c01d..e76e6f26d 100644 --- a/src/unittests/resources/sdlimagehelper.cc +++ b/src/unittests/resources/sdlimagehelper.cc @@ -29,6 +29,8 @@ PRAGMA48(GCC diagnostic pop) #include "unittests/unittests.h" #include "client.h" +#include "configmanager.h" +#include "configuration.h" #include "dirs.h" #include "graphicsmanager.h" @@ -89,12 +91,16 @@ TEST_CASE("sdlimagehelper combineSurface", "") #endif // USE_SDL2 userPalette = new UserPalette; - theme = new Theme; - Theme::selectSkin(); Dirs::initRootDir(); Dirs::initHomeDir(); + setBrandingDefaults(branding); + ConfigManager::initConfiguration(); + + theme = new Theme; + Theme::selectSkin(); + ActorSprite::load(); SECTION("empty copy1") |