Move resourcemanager from class to namespace.

2 files changed, 38 insertions, 2 deletions

diff --git a/src/resources/dye/dye_unittest.cc b/src/resources/dye/dye_unittest.cc
index 4323a28f6..f31097cbe 100644
--- a/src/resources/dye/dye_unittest.cc
+++ b/src/resources/dye/dye_unittest.cc
@@ -28,6 +28,8 @@
 
 #include "fs/virtfs/virtfs.h"
 
+#include "gui/gui.h"
+
 #include "resources/sdlimagehelper.h"
 #ifdef USE_SDL2
 #include "resources/surfaceimagehelper.h"
@@ -53,6 +55,15 @@
 
 #ifdef USE_OPENGL
 
+TEST_CASE("Dye leak test1")
+{
+    logger = new Logger();
+    REQUIRE(gui == nullptr);
+    ResourceManager::cleanOrphans(true);
+    ResourceManager::deleteInstance();
+    delete2(logger);
+}
+
 TEST_CASE("Dye replaceSOGLColor 1 1")
 {
     DyePalette palette("#00ff00,000011", 6);
@@ -2357,7 +2368,6 @@ TEST_CASE("Dye real dye")
     client = new Client;
     SDL_Init(SDL_INIT_VIDEO);
     logger = new Logger();
-    ResourceManager::init();
     VirtFs::mountDirSilent("data", Append_false);
     VirtFs::mountDirSilent("../data", Append_false);
     VirtFs::mountDirSilent("data/test", Append_false);
@@ -2400,3 +2410,12 @@ TEST_CASE("Dye real dye")
     delete2(logger);
 //    VirtFs::deinit();
 }
+
+TEST_CASE("Dye leak test2")
+{
+    logger = new Logger();
+    REQUIRE(gui == nullptr);
+    ResourceManager::cleanOrphans(true);
+    ResourceManager::deleteInstance();
+    delete2(logger);
+}
diff --git a/src/resources/dye/dyepalette_unittest.cc b/src/resources/dye/dyepalette_unittest.cc
index 14e5e5d49..280a74ead 100644
--- a/src/resources/dye/dyepalette_unittest.cc
+++ b/src/resources/dye/dyepalette_unittest.cc
@@ -52,6 +52,15 @@
 
 #include "debug.h"
 
+TEST_CASE("DyePalette leak test1")
+{
+    logger = new Logger();
+    REQUIRE(gui == nullptr);
+    ResourceManager::cleanOrphans(true);
+    ResourceManager::deleteInstance();
+    delete2(logger);
+}
+
 TEST_CASE("DyePalette tests")
 {
     setEnv("SDL_VIDEODRIVER", "dummy");
@@ -60,7 +69,6 @@ TEST_CASE("DyePalette tests")
     XML::initXML();
     SDL_Init(SDL_INIT_VIDEO);
     logger = new Logger();
-    ResourceManager::init();
     VirtFs::mountDirSilent("data", Append_false);
     VirtFs::mountDirSilent("../data", Append_false);
     VirtFs::mountDirSilent("data/test", Append_false);
@@ -399,3 +407,12 @@ TEST_CASE("DyePalette tests")
     delete2(logger);
 //    VirtFs::deinit();
 }
+
+TEST_CASE("DyePalette leak test2")
+{
+    logger = new Logger();
+    REQUIRE(gui == nullptr);
+    ResourceManager::cleanOrphans(true);
+    ResourceManager::deleteInstance();
+    delete2(logger);
+}