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/integrity.cc | |
| parent | b9ce7a70632f31a3a4b29841ab034dbb297b295d (diff) | |
| download | manaverse-59d9b799fa5bf3c8ba99cc6f703b83751f1d3497.tar.gz manaverse-59d9b799fa5bf3c8ba99cc6f703b83751f1d3497.tar.bz2 manaverse-59d9b799fa5bf3c8ba99cc6f703b83751f1d3497.tar.xz manaverse-59d9b799fa5bf3c8ba99cc6f703b83751f1d3497.zip | |
Fix unit tests after last changes in configuration.cpp
Diffstat (limited to 'src/unittests/integrity.cc')
| -rw-r--r-- | src/unittests/integrity.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/unittests/integrity.cc b/src/unittests/integrity.cc index 02682f537..a750959dc 100644 --- a/src/unittests/integrity.cc +++ b/src/unittests/integrity.cc @@ -20,6 +20,7 @@ #include "unittests/unittests.h" +#include "configmanager.h" #include "configuration.h" #include "client.h" #include "dirs.h" @@ -32,7 +33,6 @@ #include "fs/virtfs/fs.h" #include "fs/virtfs/rwops.h" -#include "gui/gui.h" #include "gui/userpalette.h" #include "gui/theme.h" @@ -137,13 +137,17 @@ TEST_CASE("integrity tests", "integrity") #endif // USE_SDL2 userPalette = new UserPalette; - config.setValue("fontSize", 16); - theme = new Theme; - Theme::selectSkin(); Dirs::initRootDir(); Dirs::initHomeDir(); + setBrandingDefaults(branding); + ConfigManager::initConfiguration(); + + config.setValue("fontSize", 16); + theme = new Theme; + Theme::selectSkin(); + ActorSprite::load(); const char *const name1 = "dir/hide.png"; const int size1 = 368; |