diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-01-05 17:00:02 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-01-05 17:00:02 +0300 |
| commit | 855387d2d795c9471587cc7ddf2c66bb676d698e (patch) | |
| tree | 3dbb1260c219312f36893dfae52f5cd40760aeb5 /src/utils/xml_unittest.cc | |
| parent | 9fefb2942865846ccb7dbdac4ebd4515b8c851a2 (diff) | |
| download | manaplus-855387d2d795c9471587cc7ddf2c66bb676d698e.tar.gz manaplus-855387d2d795c9471587cc7ddf2c66bb676d698e.tar.bz2 manaplus-855387d2d795c9471587cc7ddf2c66bb676d698e.tar.xz manaplus-855387d2d795c9471587cc7ddf2c66bb676d698e.zip | |
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.
Diffstat (limited to 'src/utils/xml_unittest.cc')
| -rw-r--r-- | src/utils/xml_unittest.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/utils/xml_unittest.cc b/src/utils/xml_unittest.cc index 52f234d12..40876e0d2 100644 --- a/src/utils/xml_unittest.cc +++ b/src/utils/xml_unittest.cc @@ -24,12 +24,15 @@ #include "being/actorsprite.h" +#include "gui/gui.h" #include "gui/theme.h" #include "utils/delete2.h" #include "utils/env.h" #include "utils/physfstools.h" +#include "render/sdlgraphics.h" + #include "resources/sdlimagehelper.h" #include "resources/resourcemanager/resourcemanager.h" @@ -41,13 +44,13 @@ TEST_CASE("xml doc") setEnv("SDL_VIDEODRIVER", "dummy"); client = new Client; - PHYSFS_init("manaplus"); dirSeparator = "/"; XML::initXML(); logger = new Logger(); ResourceManager::init(); resourceManager->addToSearchPath("data", Append_false); resourceManager->addToSearchPath("../data", Append_false); + mainGraphics = new SDLGraphics; imageHelper = new SDLImageHelper(); #ifdef USE_SDL2 SDLImageHelper::setRenderer(graphicsManager.createRenderer( @@ -62,6 +65,8 @@ TEST_CASE("xml doc") Theme::selectSkin(); const char *const tempXmlName = "tempxml.xml"; ActorSprite::load(); + gui = new Gui(); + gui->postInit(mainGraphics); SECTION("load1") { |