summaryrefslogtreecommitdiff
path: root/src/unittests/utils/xmlutils.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/unittests/utils/xmlutils.cc')
-rw-r--r--src/unittests/utils/xmlutils.cc27
1 files changed, 20 insertions, 7 deletions
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;