Move resourcemanager from class to namespace.

1 files changed, 20 insertions, 3 deletions

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);
+}