From 59d9b799fa5bf3c8ba99cc6f703b83751f1d3497 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 1 Sep 2017 04:05:51 +0300
Subject: Fix unit tests after last changes in configuration.cpp

---
 src/unittests/utils/xmlutils.cc | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

(limited to 'src/unittests/utils/xmlutils.cc')

diff --git a/src/unittests/utils/xmlutils.cc b/src/unittests/utils/xmlutils.cc
index 7a82a502c..bff998057 100644
--- a/src/unittests/utils/xmlutils.cc
+++ b/src/unittests/utils/xmlutils.cc
@@ -21,6 +21,8 @@
 #include "unittests/unittests.h"
 
 #include "client.h"
+#include "configmanager.h"
+#include "configuration.h"
 #include "dirs.h"
 #include "graphicsmanager.h"
 
@@ -28,7 +30,6 @@
 
 #include "fs/virtfs/fs.h"
 
-#include "gui/gui.h"
 #include "gui/userpalette.h"
 #include "gui/theme.h"
 
@@ -66,12 +67,16 @@ TEST_CASE("xmlutils readXmlIntVector 1", "")
 #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();
 
     STD_VECTOR<int> arr;
@@ -123,12 +128,16 @@ TEST_CASE("xmlutils readXmlStringMap 1", "")
 #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();
 
     std::map<std::string, std::string> arr;
@@ -181,12 +190,16 @@ TEST_CASE("xmlutils readXmlIntMap 1", "")
 #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();
 
     std::map<int32_t, int32_t> arr;
-- 
cgit v1.2.3-60-g2f50