summaryrefslogtreecommitdiff
path: root/src/resources/sprite
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/sprite
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/sprite')
-rw-r--r--src/resources/sprite/animatedsprite.cpp2
-rw-r--r--src/resources/sprite/animatedsprite_unittest.cc19
2 files changed, 19 insertions, 2 deletions
diff --git a/src/resources/sprite/animatedsprite.cpp b/src/resources/sprite/animatedsprite.cpp
index 960a5ea00..3e9250e13 100644
--- a/src/resources/sprite/animatedsprite.cpp
+++ b/src/resources/sprite/animatedsprite.cpp
@@ -90,7 +90,7 @@ AnimatedSprite *AnimatedSprite::delayedLoad(const std::string &restrict
{
if (!mEnableCache)
return load(filename, variant);
- Resource *restrict const res = resourceManager->getFromCache(
+ Resource *restrict const res = ResourceManager::getFromCache(
filename, variant);
if (res)
{
diff --git a/src/resources/sprite/animatedsprite_unittest.cc b/src/resources/sprite/animatedsprite_unittest.cc
index d17177a6d..f48b10b4b 100644
--- a/src/resources/sprite/animatedsprite_unittest.cc
+++ b/src/resources/sprite/animatedsprite_unittest.cc
@@ -54,6 +54,15 @@
#include "debug.h"
+TEST_CASE("AnimatedSprite leak test1")
+{
+ logger = new Logger();
+ REQUIRE(gui == nullptr);
+ ResourceManager::cleanOrphans(true);
+ ResourceManager::deleteInstance();
+ delete2(logger);
+}
+
TEST_CASE("AnimatedSprite tests", "animatedsprite")
{
setEnv("SDL_VIDEODRIVER", "dummy");
@@ -63,7 +72,6 @@ TEST_CASE("AnimatedSprite tests", "animatedsprite")
XML::initXML();
SDL_Init(SDL_INIT_VIDEO);
logger = new Logger();
- ResourceManager::init();
VirtFs::mountDirSilent("data", Append_false);
VirtFs::mountDirSilent("../data", Append_false);
mainGraphics = new SDLGraphics;
@@ -196,3 +204,12 @@ TEST_CASE("AnimatedSprite tests", "animatedsprite")
delete2(logger);
// VirtFs::deinit();
}
+
+TEST_CASE("AnimatedSprite leak test2")
+{
+ logger = new Logger();
+ REQUIRE(gui == nullptr);
+ ResourceManager::cleanOrphans(true);
+ ResourceManager::deleteInstance();
+ delete2(logger);
+}