From 59d9b799fa5bf3c8ba99cc6f703b83751f1d3497 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 1 Sep 2017 04:05:51 +0300 Subject: Fix unit tests after last changes in configuration.cpp --- src/unittests/integrity.cc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/unittests/integrity.cc') 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; -- cgit v1.2.3-60-g2f50