summaryrefslogtreecommitdiff
path: root/src/resources/map
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-04-07 02:48:12 +0300
committerAndrei Karas <akaras@inbox.ru>2017-04-08 16:46:28 +0300
commit27a2dd4fce2d529cd1d96aa5ddce1e74b4f54a2f (patch)
treec2c38e1b4f308ca885dc3c3581560cfbc6833a8e /src/resources/map
parentd4e28aa97cbce34a0053d3c02cf070ef9065439f (diff)
downloadmv-27a2dd4fce2d529cd1d96aa5ddce1e74b4f54a2f.tar.gz
mv-27a2dd4fce2d529cd1d96aa5ddce1e74b4f54a2f.tar.bz2
mv-27a2dd4fce2d529cd1d96aa5ddce1e74b4f54a2f.tar.xz
mv-27a2dd4fce2d529cd1d96aa5ddce1e74b4f54a2f.zip
Move resourcemanager from class to namespace.
Diffstat (limited to 'src/resources/map')
-rw-r--r--src/resources/map/maplayer_unittest.cc3
-rw-r--r--src/resources/map/speciallayer_unittest.cc23
2 files changed, 21 insertions, 5 deletions
diff --git a/src/resources/map/maplayer_unittest.cc b/src/resources/map/maplayer_unittest.cc
index 945c52b0e..e8066029c 100644
--- a/src/resources/map/maplayer_unittest.cc
+++ b/src/resources/map/maplayer_unittest.cc
@@ -1649,7 +1649,6 @@ TEST_CASE("MapLayer draw")
TEST_CASE("MapLayer drawSpecialLayer (specialLayer)")
{
logger = new Logger;
- ResourceManager::init();
VirtFs::mountDirSilent("data", Append_false);
VirtFs::mountDirSilent("../data", Append_false);
@@ -2002,7 +2001,6 @@ TEST_CASE("MapLayer drawSpecialLayer (specialLayer)")
TEST_CASE("MapLayer drawSpecialLayer (tempLayer)")
{
logger = new Logger;
- ResourceManager::init();
VirtFs::mountDirSilent("data", Append_false);
VirtFs::mountDirSilent("../data", Append_false);
@@ -2361,7 +2359,6 @@ TEST_CASE("MapLayer drawSpecialLayer (tempLayer)")
TEST_CASE("MapLayer drawFringe")
{
logger = new Logger;
- ResourceManager::init();
VirtFs::mountDirSilent("data", Append_false);
VirtFs::mountDirSilent("../data", Append_false);
diff --git a/src/resources/map/speciallayer_unittest.cc b/src/resources/map/speciallayer_unittest.cc
index 93270d7e5..d43daaac8 100644
--- a/src/resources/map/speciallayer_unittest.cc
+++ b/src/resources/map/speciallayer_unittest.cc
@@ -30,6 +30,8 @@
#include "fs/virtfs/virtfs.h"
+#include "gui/gui.h"
+
#include "utils/delete2.h"
#include "resources/sdlimagehelper.h"
@@ -40,11 +42,19 @@
#include "debug.h"
+TEST_CASE("SpecialLayer leak test1")
+{
+ logger = new Logger();
+ REQUIRE(gui == nullptr);
+ ResourceManager::cleanOrphans(true);
+ ResourceManager::deleteInstance();
+ delete2(logger);
+}
+
TEST_CASE("SpecialLayer updateCache")
{
logger = new Logger;
client = new Client;
- ResourceManager::init();
VirtFs::mountDirSilent("data", Append_false);
VirtFs::mountDirSilent("../data", Append_false);
@@ -260,9 +270,18 @@ TEST_CASE("SpecialLayer updateCache")
}
delete layer;
- resourceManager->cleanOrphans();
+ ResourceManager::cleanOrphans();
delete2(client);
VirtFs::unmountDirSilent("data");
VirtFs::unmountDirSilent("../data");
delete2(logger);
}
+
+TEST_CASE("SpecialLayer leak test2")
+{
+ logger = new Logger();
+ REQUIRE(gui == nullptr);
+ ResourceManager::cleanOrphans(true);
+ ResourceManager::deleteInstance();
+ delete2(logger);
+}