From 9ff7894ef1eeff001f3ddc1a1caec18176428fa1 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 29 Aug 2016 20:26:16 +0300 Subject: Add some cleanup calls in unit tests. --- src/utils/xml_unittest.cc | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'src/utils/xml_unittest.cc') diff --git a/src/utils/xml_unittest.cc b/src/utils/xml_unittest.cc index e2f68181e..d90bfb37d 100644 --- a/src/utils/xml_unittest.cc +++ b/src/utils/xml_unittest.cc @@ -21,16 +21,27 @@ #include "catch.hpp" #include "client.h" #include "logger.h" +#include "graphicsmanager.h" +#include "being/actorsprite.h" + +#include "gui/theme.h" + +#include "utils/delete2.h" +#include "utils/env.h" #include "utils/physfstools.h" #include "utils/xml.h" +#include "resources/sdlimagehelper.h" + #include "resources/resourcemanager/resourcemanager.h" #include "debug.h" TEST_CASE("xml doc") { + setEnv("SDL_VIDEODRIVER", "dummy"); + client = new Client; PHYSFS_init("manaplus"); dirSeparator = "/"; @@ -39,7 +50,19 @@ TEST_CASE("xml doc") ResourceManager::init(); resourceManager->addToSearchPath("data", Append_false); resourceManager->addToSearchPath("../data", Append_false); + imageHelper = new SDLImageHelper(); +#ifdef USE_SDL2 + SDLImageHelper::setRenderer(graphicsManager.createRenderer( + graphicsManager.createWindow(640, 480, 0, + SDL_WINDOW_SHOWN | SDL_SWSURFACE), SDL_RENDERER_SOFTWARE)); +#else + graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE); +#endif + + theme = new Theme; + Theme::selectSkin(); const char *const tempXmlName = "tempxml.xml"; + ActorSprite::load(); SECTION("load1") { @@ -326,4 +349,5 @@ TEST_CASE("xml doc") // clean again ::remove(tempXmlName); } + delete2(client); } -- cgit v1.2.3-70-g09d2