From 855387d2d795c9471587cc7ddf2c66bb676d698e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 5 Jan 2017 17:00:02 +0300 Subject: Fix different issues in unit tests. Fix crash with some compilers flags. Clean window container to null after it was removed. Init and deinit physfs globally. --- src/utils/chatutils_unittest.cc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/utils/chatutils_unittest.cc') diff --git a/src/utils/chatutils_unittest.cc b/src/utils/chatutils_unittest.cc index 2077bfe5e..374bf3125 100644 --- a/src/utils/chatutils_unittest.cc +++ b/src/utils/chatutils_unittest.cc @@ -27,12 +27,15 @@ #include "being/localplayer.h" +#include "gui/gui.h" #include "gui/theme.h" #include "utils/chatutils.h" #include "utils/delete2.h" #include "utils/physfstools.h" +#include "render/sdlgraphics.h" + #include "resources/sdlimagehelper.h" #include "resources/resourcemanager/resourcemanager.h" @@ -46,7 +49,6 @@ TEST_CASE("chatutils replaceVars") { client = new Client; - PHYSFS_init("manaplus"); dirSeparator = "/"; XML::initXML(); SDL_Init(SDL_INIT_VIDEO); @@ -57,6 +59,10 @@ TEST_CASE("chatutils replaceVars") theme = new Theme; Theme::selectSkin(); imageHelper = new SDLImageHelper(); + mainGraphics = new SDLGraphics; + + gui = new Gui(); + gui->postInit(mainGraphics); #ifdef USE_SDL2 SDLImageHelper::setRenderer(graphicsManager.createRenderer( graphicsManager.createWindow(640, 480, 0, -- cgit v1.2.3-60-g2f50