From 028120afb03b1acee59fad9a2240f8b80c97bc67 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 30 Aug 2017 04:35:10 +0300 Subject: Fix memory leaks in unit tests. --- src/unittests/resources/map/maplayer/drawfringenormal.cc | 4 ++++ src/unittests/resources/map/maplayer/drawfringesimple.cc | 4 ++++ src/unittests/resources/map/maplayer/drawspeciallayer1.cc | 4 ++++ src/unittests/resources/map/maplayer/drawspeciallayer2.cc | 4 ++++ 4 files changed, 16 insertions(+) (limited to 'src/unittests/resources') 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); -- cgit v1.2.3-60-g2f50