summaryrefslogtreecommitdiff
path: root/src/utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/chatutils_unittest.cc14
-rw-r--r--src/utils/translation/poparser_unittest.cc10
-rw-r--r--src/utils/xml_unittest.cc10
3 files changed, 32 insertions, 2 deletions
diff --git a/src/utils/chatutils_unittest.cc b/src/utils/chatutils_unittest.cc
index a62cd57a4..7b3dd251e 100644
--- a/src/utils/chatutils_unittest.cc
+++ b/src/utils/chatutils_unittest.cc
@@ -20,6 +20,9 @@
#include "catch.hpp"
#include "client.h"
+#include "configuration.h"
+#include "configmanager.h"
+#include "dirs.h"
#include "actormanager.h"
#include "graphicsmanager.h"
@@ -61,8 +64,6 @@ TEST_CASE("chatutils replaceVars")
imageHelper = new SDLImageHelper();
mainGraphics = new SDLGraphics;
- gui = new Gui();
- gui->postInit(mainGraphics);
#ifdef USE_SDL2
SDLImageHelper::setRenderer(graphicsManager.createRenderer(
graphicsManager.createWindow(640, 480, 0,
@@ -72,6 +73,15 @@ TEST_CASE("chatutils replaceVars")
graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE);
#endif // USE_SDL2
+ Dirs::initRootDir();
+ Dirs::initHomeDir();
+
+ ConfigManager::initConfiguration();
+ getConfigDefaults2(config.getDefaultValues());
+
+ gui = new Gui();
+ gui->postInit(mainGraphics);
+
ActorSprite::load();
localPlayer = new LocalPlayer(static_cast<BeingId>(1),
BeingTypeId_zero);
diff --git a/src/utils/translation/poparser_unittest.cc b/src/utils/translation/poparser_unittest.cc
index 510be11bb..ff8370344 100644
--- a/src/utils/translation/poparser_unittest.cc
+++ b/src/utils/translation/poparser_unittest.cc
@@ -20,6 +20,9 @@
#include "catch.hpp"
#include "client.h"
+#include "configuration.h"
+#include "configmanager.h"
+#include "dirs.h"
#include "graphicsmanager.h"
#include "being/actorsprite.h"
@@ -66,6 +69,13 @@ TEST_CASE("PoParser tests", "PoParser")
theme = new Theme;
Theme::selectSkin();
+
+ Dirs::initRootDir();
+ Dirs::initHomeDir();
+
+ ConfigManager::initConfiguration();
+ getConfigDefaults2(config.getDefaultValues());
+
ActorSprite::load();
gui = new Gui();
gui->postInit(mainGraphics);
diff --git a/src/utils/xml_unittest.cc b/src/utils/xml_unittest.cc
index 64ee293b7..8cdebf86f 100644
--- a/src/utils/xml_unittest.cc
+++ b/src/utils/xml_unittest.cc
@@ -20,6 +20,9 @@
#include "catch.hpp"
#include "client.h"
+#include "configuration.h"
+#include "configmanager.h"
+#include "dirs.h"
#include "graphicsmanager.h"
#include "being/actorsprite.h"
@@ -66,6 +69,13 @@ TEST_CASE("xml doc")
theme = new Theme;
Theme::selectSkin();
+
+ Dirs::initRootDir();
+ Dirs::initHomeDir();
+
+ ConfigManager::initConfiguration();
+ getConfigDefaults2(config.getDefaultValues());
+
const char *const tempXmlName = "tempxml.xml";
ActorSprite::load();
gui = new Gui();