diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-08-30 04:35:10 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-08-30 04:35:10 +0300 |
| commit | 028120afb03b1acee59fad9a2240f8b80c97bc67 (patch) | |
| tree | 124d53db3ff1780cdda748c309243886d16d680c /src/unittests/resources | |
| parent | 3bad25f9be2ce5ee41849e2ceab837654b58567d (diff) | |
| download | mv-028120afb03b1acee59fad9a2240f8b80c97bc67.tar.gz mv-028120afb03b1acee59fad9a2240f8b80c97bc67.tar.bz2 mv-028120afb03b1acee59fad9a2240f8b80c97bc67.tar.xz mv-028120afb03b1acee59fad9a2240f8b80c97bc67.zip | |
Fix memory leaks in unit tests.
Diffstat (limited to 'src/unittests/resources')
4 files changed, 16 insertions, 0 deletions
diff --git a/src/unittests/resources/map/maplayer/drawfringenormal.cc b/src/unittests/resources/map/maplayer/drawfringenormal.cc index 84564ae64..6ab0a395c 100644 --- a/src/unittests/resources/map/maplayer/drawfringenormal.cc +++ b/src/unittests/resources/map/maplayer/drawfringenormal.cc @@ -35,6 +35,8 @@ #include "utils/delete2.h" #include "utils/env.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "resources/sdlimagehelper.h" #include "resources/image/image.h" @@ -511,6 +513,8 @@ TEST_CASE("MapLayer drawFringe normal", "") delete mock; delete2(theme); GraphicsManager::deleteRenderers(); + ResourceManager::cleanOrphans(true); + ResourceManager::deleteInstance(); VirtFs::unmountDirSilent("data"); VirtFs::unmountDirSilent("../data"); delete2(logger); diff --git a/src/unittests/resources/map/maplayer/drawfringesimple.cc b/src/unittests/resources/map/maplayer/drawfringesimple.cc index fa24d3b94..6a362b8aa 100644 --- a/src/unittests/resources/map/maplayer/drawfringesimple.cc +++ b/src/unittests/resources/map/maplayer/drawfringesimple.cc @@ -33,6 +33,8 @@ #include "utils/delete2.h" #include "utils/env.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "resources/sdlimagehelper.h" #include "resources/image/image.h" @@ -489,6 +491,8 @@ TEST_CASE("MapLayer drawFringe simple", "") delete mock; delete2(theme); GraphicsManager::deleteRenderers(); + ResourceManager::cleanOrphans(true); + ResourceManager::deleteInstance(); VirtFs::unmountDirSilent("data"); VirtFs::unmountDirSilent("../data"); delete2(logger); diff --git a/src/unittests/resources/map/maplayer/drawspeciallayer1.cc b/src/unittests/resources/map/maplayer/drawspeciallayer1.cc index 79cd056bb..3224eb5ef 100644 --- a/src/unittests/resources/map/maplayer/drawspeciallayer1.cc +++ b/src/unittests/resources/map/maplayer/drawspeciallayer1.cc @@ -31,6 +31,8 @@ #include "utils/delete2.h" #include "utils/env.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "resources/sdlimagehelper.h" #include "resources/map/map.h" @@ -379,6 +381,8 @@ TEST_CASE("MapLayer drawSpecialLayer (specialLayer)", "") delete map; delete mock; GraphicsManager::deleteRenderers(); + ResourceManager::cleanOrphans(true); + ResourceManager::deleteInstance(); VirtFs::unmountDirSilent("data"); VirtFs::unmountDirSilent("../data"); delete2(logger); diff --git a/src/unittests/resources/map/maplayer/drawspeciallayer2.cc b/src/unittests/resources/map/maplayer/drawspeciallayer2.cc index e47ccdb97..0092b2019 100644 --- a/src/unittests/resources/map/maplayer/drawspeciallayer2.cc +++ b/src/unittests/resources/map/maplayer/drawspeciallayer2.cc @@ -31,6 +31,8 @@ #include "utils/delete2.h" #include "utils/env.h" +#include "resources/resourcemanager/resourcemanager.h" + #include "resources/sdlimagehelper.h" #include "resources/map/map.h" @@ -385,6 +387,8 @@ TEST_CASE("MapLayer drawSpecialLayer (tempLayer)", "") delete map; delete mock; GraphicsManager::deleteRenderers(); + ResourceManager::cleanOrphans(true); + ResourceManager::deleteInstance(); VirtFs::unmountDirSilent("data"); VirtFs::unmountDirSilent("../data"); delete2(logger); |