From 27a2dd4fce2d529cd1d96aa5ddce1e74b4f54a2f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 7 Apr 2017 02:48:12 +0300 Subject: Move resourcemanager from class to namespace. --- src/gui/windowmanager_unittest.cc | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) (limited to 'src/gui/windowmanager_unittest.cc') diff --git a/src/gui/windowmanager_unittest.cc b/src/gui/windowmanager_unittest.cc index 49ea9d97c..b19844ac9 100644 --- a/src/gui/windowmanager_unittest.cc +++ b/src/gui/windowmanager_unittest.cc @@ -130,6 +130,15 @@ extern QuitDialog *quitDialog; +TEST_CASE("windows leak test1") +{ + logger = new Logger(); + REQUIRE(gui == nullptr); + ResourceManager::cleanOrphans(true); + ResourceManager::deleteInstance(); + delete2(logger); +} + TEST_CASE("Windows tests", "windowmanager") { setEnv("SDL_VIDEODRIVER", "dummy"); @@ -139,8 +148,7 @@ TEST_CASE("Windows tests", "windowmanager") SDL_Init(SDL_INIT_VIDEO); logger = new Logger(); ResourceManager::deleteInstance(); - ResourceManager::init(); - resourceManager->cleanOrphans(true); + ResourceManager::cleanOrphans(true); VirtFs::mountDirSilent("data", Append_false); VirtFs::mountDirSilent("../data", Append_false); VirtFs::mountDirSilent("data/test", Append_false); @@ -723,8 +731,7 @@ TEST_CASE("WindowManager", "create windows") SDL_Init(SDL_INIT_VIDEO); logger = new Logger(); ResourceManager::deleteInstance(); - ResourceManager::init(); - resourceManager->cleanOrphans(true); + ResourceManager::cleanOrphans(true); VirtFs::mountDirSilent("data", Append_false); VirtFs::mountDirSilent("../data", Append_false); VirtFs::mountDirSilent("data/test", Append_false); @@ -869,3 +876,12 @@ TEST_CASE("WindowManager", "create windows") // VirtFs::deinit(); } + +TEST_CASE("windows leak test2") +{ + logger = new Logger(); + REQUIRE(gui == nullptr); + ResourceManager::cleanOrphans(true); + ResourceManager::deleteInstance(); + delete2(logger); +} -- cgit v1.2.3-60-g2f50