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/translation | |
| parent | 9fefb2942865846ccb7dbdac4ebd4515b8c851a2 (diff) | |
| download | mv-855387d2d795c9471587cc7ddf2c66bb676d698e.tar.gz mv-855387d2d795c9471587cc7ddf2c66bb676d698e.tar.bz2 mv-855387d2d795c9471587cc7ddf2c66bb676d698e.tar.xz mv-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/translation')
| -rw-r--r-- | src/utils/translation/poparser_unittest.cc | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/utils/translation/poparser_unittest.cc b/src/utils/translation/poparser_unittest.cc index 9a138c67c..77cb4c22d 100644 --- a/src/utils/translation/poparser_unittest.cc +++ b/src/utils/translation/poparser_unittest.cc @@ -25,17 +25,22 @@ #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 "utils/translation/podict.h" #include "utils/translation/poparser.h" +#include "render/sdlgraphics.h" + #include "resources/sdlimagehelper.h" #include "resources/resourcemanager/resourcemanager.h" -#include "utils/delete2.h" -#include "utils/env.h" -#include "utils/physfstools.h" - #include "debug.h" TEST_CASE("PoParser tests", "PoParser") @@ -43,13 +48,13 @@ TEST_CASE("PoParser tests", "PoParser") setEnv("SDL_VIDEODRIVER", "dummy"); client = new Client; - PHYSFS_init("manaplus"); dirSeparator = "/"; 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( @@ -60,7 +65,11 @@ TEST_CASE("PoParser tests", "PoParser") graphicsManager.createWindow(640, 480, 0, SDL_ANYFORMAT | SDL_SWSURFACE); #endif // USE_SDL2 + theme = new Theme; + Theme::selectSkin(); ActorSprite::load(); + gui = new Gui(); + gui->postInit(mainGraphics); SECTION("PoParser empty") { |