From 9ff7894ef1eeff001f3ddc1a1caec18176428fa1 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 29 Aug 2016 20:26:16 +0300
Subject: Add some cleanup calls in unit tests.

---
 src/gui/widgets/browserbox_unittest.cc |  3 +++
 src/gui/windowmanager_unittest.cc      | 25 ++++++++++++-------------
 2 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'src/gui')

diff --git a/src/gui/widgets/browserbox_unittest.cc b/src/gui/widgets/browserbox_unittest.cc
index 9aadeac09..e0ff9e13d 100644
--- a/src/gui/widgets/browserbox_unittest.cc
+++ b/src/gui/widgets/browserbox_unittest.cc
@@ -27,6 +27,8 @@
 
 #include "gui/widgets/browserbox.h"
 
+#include "resources/resourcemanager/resourcemanager.h"
+
 #include "resources/sdlimagehelper.h"
 
 #include <physfs.h>
@@ -43,6 +45,7 @@ TEST_CASE("BrowserBox tests", "browserbox")
     logger = new Logger();
     imageHelper = new SDLImageHelper();
     theme = new Theme;
+    ResourceManager::init();
     ActorSprite::load();
     Widget::setGlobalFont(new Font("/usr/share/fonts/truetype/"
         "ttf-dejavu/DejaVuSans-Oblique.ttf", 18));
diff --git a/src/gui/windowmanager_unittest.cc b/src/gui/windowmanager_unittest.cc
index 37edeb1df..6ae3b0e34 100644
--- a/src/gui/windowmanager_unittest.cc
+++ b/src/gui/windowmanager_unittest.cc
@@ -133,10 +133,10 @@ TEST_CASE("Windows tests", "windowmanager")
     XML::initXML();
     SDL_Init(SDL_INIT_VIDEO);
     logger = new Logger();
-    delete ResourceManager::instance;
-    ResourceManager::instance = nullptr;
+    delete resourceManager;
     resourceManager = nullptr;
     ResourceManager::init();
+    resourceManager->cleanOrphans(true);
     resourceManager->addToSearchPath("data", Append_false);
     resourceManager->addToSearchPath("../data", Append_false);
     branding.setValue("onlineServerFile", "test/serverlistplus.xml");
@@ -228,17 +228,15 @@ TEST_CASE("Windows tests", "windowmanager")
     }
     SECTION("CharCreateDialog")
     {
-/*
-        LoginData data;
-        CharSelectDialog *dialog2;
-        CREATEWIDGETV(dialog2, CharSelectDialog, data);
-        CharCreateDialog *dialog;
-        CREATEWIDGETV(dialog, CharCreateDialog, dialog2, 0);
-        gui->draw();
-        mainGraphics->updateScreen();
-        delete2(dialog);
-        delete2(dialog2);
-*/
+//        LoginData data;
+//        CharSelectDialog *dialog2;
+//        CREATEWIDGETV(dialog2, CharSelectDialog, data);
+//        CharCreateDialog *dialog;
+//        CREATEWIDGETV(dialog, CharCreateDialog, dialog2, 0);
+//        gui->draw();
+//        mainGraphics->updateScreen();
+//        delete2(dialog);
+//        delete2(dialog2);
     }
     SECTION("ChatWindow")
     {
@@ -562,6 +560,7 @@ TEST_CASE("Windows tests", "windowmanager")
         mainGraphics->updateScreen();
         delete2(dialog);
     }
+
     SECTION("TextDialog")
     {
         TextDialog *dialog = CREATEWIDGETR(TextDialog,
-- 
cgit v1.2.3-70-g09d2