summaryrefslogtreecommitdiff
path: root/src/unittests/sdl.cc
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-09-01 04:05:51 +0300
committerAndrei Karas <akaras@inbox.ru>2017-09-01 04:05:51 +0300
commit59d9b799fa5bf3c8ba99cc6f703b83751f1d3497 (patch)
tree16b29e2afda9f223f36e6a7d3f4659fb72d3d7e6 /src/unittests/sdl.cc
parentb9ce7a70632f31a3a4b29841ab034dbb297b295d (diff)
downloadmv-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/sdl.cc')
-rw-r--r--src/unittests/sdl.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/unittests/sdl.cc b/src/unittests/sdl.cc
index d5026a583..1d2943605 100644
--- a/src/unittests/sdl.cc
+++ b/src/unittests/sdl.cc
@@ -20,6 +20,7 @@
#include "unittests/unittests.h"
+#include "configmanager.h"
#include "configuration.h"
#include "client.h"
#include "dirs.h"
@@ -31,7 +32,6 @@
#include "fs/virtfs/fs.h"
-#include "gui/gui.h"
#include "gui/userpalette.h"
#include "gui/theme.h"
@@ -86,12 +86,16 @@ TEST_CASE("sdl tests", "sdl")
userPalette = new UserPalette;
config.setValue("fontSize", 16);
- theme = new Theme;
- Theme::selectSkin();
Dirs::initRootDir();
Dirs::initHomeDir();
+ setBrandingDefaults(branding);
+ ConfigManager::initConfiguration();
+
+ theme = new Theme;
+ Theme::selectSkin();
+
ActorSprite::load();
SECTION("sdl SDL DuplicateSurface1")