Move resourcemanager from class to namespace.

5 files changed, 79 insertions, 8 deletions

diff --git a/src/utils/chatutils_unittest.cc b/src/utils/chatutils_unittest.cc
index b5b368f31..d613665dc 100644
--- a/src/utils/chatutils_unittest.cc
+++ b/src/utils/chatutils_unittest.cc
@@ -50,13 +50,21 @@
 
 #include "debug.h"
 
+TEST_CASE("chatutils leak test1")
+{
+    logger = new Logger();
+    REQUIRE(gui == nullptr);
+    ResourceManager::cleanOrphans(true);
+    ResourceManager::deleteInstance();
+    delete2(logger);
+}
+
 TEST_CASE("chatutils replaceVars")
 {
     client = new Client;
     XML::initXML();
     SDL_Init(SDL_INIT_VIDEO);
     logger = new Logger();
-    ResourceManager::init();
     VirtFs::mountDirSilent("data", Append_false);
     VirtFs::mountDirSilent("../data", Append_false);
     theme = new Theme;
@@ -260,3 +268,12 @@ TEST_CASE("chatutils textToMe")
     REQUIRE(textToMe("*") == "***");
     REQUIRE(textToMe("test line") == "*test line*");
 }
+
+TEST_CASE("chatutils leak test2")
+{
+    logger = new Logger();
+    REQUIRE(gui == nullptr);
+    ResourceManager::cleanOrphans(true);
+    ResourceManager::deleteInstance();
+    delete2(logger);
+}
diff --git a/src/utils/stringutils_unittest.cc b/src/utils/stringutils_unittest.cc
index d93e7a007..9d3285ccc 100644
--- a/src/utils/stringutils_unittest.cc
+++ b/src/utils/stringutils_unittest.cc
@@ -1474,7 +1474,6 @@ TEST_CASE("stringuntils timeDiffToString")
 TEST_CASE("stringuntils replaceItemLinks")
 {
     logger = new Logger();
-    ResourceManager::init();
     VirtFs::mountDirSilent("data", Append_false);
     VirtFs::mountDirSilent("../data", Append_false);
     VirtFs::mountDirSilent("data/test", Append_false);
diff --git a/src/utils/translation/poparser_unittest.cc b/src/utils/translation/poparser_unittest.cc
index 3d7ac2aaa..7ba006f82 100644
--- a/src/utils/translation/poparser_unittest.cc
+++ b/src/utils/translation/poparser_unittest.cc
@@ -46,13 +46,21 @@
 
 #include "debug.h"
 
+TEST_CASE("PoParser leak test1")
+{
+    logger = new Logger();
+    REQUIRE(gui == nullptr);
+    ResourceManager::cleanOrphans(true);
+    ResourceManager::deleteInstance();
+    delete2(logger);
+}
+
 TEST_CASE("PoParser tests", "PoParser")
 {
     setEnv("SDL_VIDEODRIVER", "dummy");
 
     client = new Client;
     logger = new Logger();
-    ResourceManager::init();
     VirtFs::mountDirSilent("data", Append_false);
     VirtFs::mountDirSilent("../data", Append_false);
 
@@ -137,3 +145,12 @@ TEST_CASE("PoParser tests", "PoParser")
     delete2(logger);
 //    VirtFs::deinit();
 }
+
+TEST_CASE("PoParser leak test2")
+{
+    logger = new Logger();
+    REQUIRE(gui == nullptr);
+    ResourceManager::cleanOrphans(true);
+    ResourceManager::deleteInstance();
+    delete2(logger);
+}
diff --git a/src/utils/xml_unittest.cc b/src/utils/xml_unittest.cc
index a52c5f522..6fd9a5e0a 100644
--- a/src/utils/xml_unittest.cc
+++ b/src/utils/xml_unittest.cc
@@ -42,18 +42,29 @@
 
 #include "resources/sdlimagehelper.h"
 
+#include "resources/sprite/animatedsprite.h"
+
 #include "resources/resourcemanager/resourcemanager.h"
 
 #include "debug.h"
 
+TEST_CASE("xml test1")
+{
+    logger = new Logger();
+    REQUIRE(client == nullptr);
+    REQUIRE(gui == nullptr);
+    ResourceManager::cleanOrphans(true);
+    ResourceManager::deleteInstance();
+    delete2(logger);
+}
+
 TEST_CASE("xml doc")
 {
     setEnv("SDL_VIDEODRIVER", "dummy");
 
+    logger = new Logger();
     client = new Client;
     XML::initXML();
-    logger = new Logger();
-    ResourceManager::init();
     VirtFs::mountDirSilent("data", Append_false);
     VirtFs::mountDirSilent("../data", Append_false);
     mainGraphics = new SDLGraphics;
@@ -371,9 +382,19 @@ TEST_CASE("xml doc")
 
     delete2(theme);
     delete2(client);
+    ResourceManager::deleteInstance();
     VirtFs::unmountDirSilent("data");
     VirtFs::unmountDirSilent("../data");
 
     delete2(logger);
 //    VirtFs::deinit();
 }
+
+TEST_CASE("xml test2")
+{
+    logger = new Logger();
+    REQUIRE(gui == nullptr);
+    ResourceManager::cleanOrphans(true);
+    ResourceManager::deleteInstance();
+    delete2(logger);
+}
diff --git a/src/utils/xmlutils_unittest.cc b/src/utils/xmlutils_unittest.cc
index 1a9796b8e..4752eaa53 100644
--- a/src/utils/xmlutils_unittest.cc
+++ b/src/utils/xmlutils_unittest.cc
@@ -28,6 +28,8 @@
 
 #include "fs/virtfs/virtfs.h"
 
+#include "gui/gui.h"
+
 #include "utils/delete2.h"
 
 #include "render/sdlgraphics.h"
@@ -38,12 +40,20 @@
 
 #include "debug.h"
 
+TEST_CASE("xmlutils leak test1")
+{
+    logger = new Logger();
+    REQUIRE(gui == nullptr);
+    ResourceManager::cleanOrphans(true);
+    ResourceManager::deleteInstance();
+    delete2(logger);
+}
+
 TEST_CASE("xmlutils readXmlIntVector 1")
 {
     client = new Client;
     XML::initXML();
     logger = new Logger();
-    ResourceManager::init();
     VirtFs::mountDirSilent("data", Append_false);
     VirtFs::mountDirSilent("../data", Append_false);
 
@@ -89,7 +99,6 @@ TEST_CASE("xmlutils readXmlStringMap 1")
     client = new Client;
     XML::initXML();
     logger = new Logger();
-    ResourceManager::init();
     VirtFs::mountDirSilent("data", Append_false);
     VirtFs::mountDirSilent("../data", Append_false);
 
@@ -134,7 +143,6 @@ TEST_CASE("xmlutils readXmlIntMap 1")
     client = new Client;
     XML::initXML();
     logger = new Logger();
-    ResourceManager::init();
     VirtFs::mountDirSilent("data", Append_false);
     VirtFs::mountDirSilent("../data", Append_false);
     VirtFs::mountDirSilent("data/test", Append_false);
@@ -177,3 +185,12 @@ TEST_CASE("xmlutils readXmlIntMap 1")
     delete2(logger);
 //    VirtFs::deinit();
 }
+
+TEST_CASE("xmlutils leak test2")
+{
+    logger = new Logger();
+    REQUIRE(gui == nullptr);
+    ResourceManager::cleanOrphans(true);
+    ResourceManager::deleteInstance();
+    delete2(logger);
+}