From 9b88bc66fc280b7c178aabcacf51664f848246fe Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 31 Aug 2017 02:31:53 +0300 Subject: Remove now useless leak tests in unit tests. --- src/unittests/resources/dye/dye.cc | 18 ------------------ src/unittests/resources/dye/dyepalette.cc | 18 ------------------ src/unittests/resources/map/speciallayer.cc | 18 ------------------ .../resources/resourcemanager/resourcemanager.cc | 18 ------------------ src/unittests/resources/sprite/animatedsprite.cc | 18 ------------------ 5 files changed, 90 deletions(-) (limited to 'src/unittests/resources') diff --git a/src/unittests/resources/dye/dye.cc b/src/unittests/resources/dye/dye.cc index 3227a72d8..f9c98e635 100644 --- a/src/unittests/resources/dye/dye.cc +++ b/src/unittests/resources/dye/dye.cc @@ -60,15 +60,6 @@ PRAGMA48(GCC diagnostic pop) #ifdef USE_OPENGL -TEST_CASE("Dye leak test1", "") -{ - logger = new Logger(); - REQUIRE(gui == nullptr); - ResourceManager::cleanOrphans(true); - ResourceManager::deleteInstance(); - delete2(logger); -} - TEST_CASE("Dye replaceSOGLColor 1 1", "") { DyePalette palette("#00ff00,000011", 6); @@ -2021,12 +2012,3 @@ TEST_CASE("Dye real dye", "") delete2(logger); // VirtFs::deinit(); } - -TEST_CASE("Dye leak test2", "") -{ - logger = new Logger(); - REQUIRE(gui == nullptr); - ResourceManager::cleanOrphans(true); - ResourceManager::deleteInstance(); - delete2(logger); -} diff --git a/src/unittests/resources/dye/dyepalette.cc b/src/unittests/resources/dye/dyepalette.cc index 9a64be1f5..d5fec4fcc 100644 --- a/src/unittests/resources/dye/dyepalette.cc +++ b/src/unittests/resources/dye/dyepalette.cc @@ -55,15 +55,6 @@ PRAGMA48(GCC diagnostic pop) #include "debug.h" -TEST_CASE("DyePalette leak test1", "") -{ - logger = new Logger(); - REQUIRE(gui == nullptr); - ResourceManager::cleanOrphans(true); - ResourceManager::deleteInstance(); - delete2(logger); -} - TEST_CASE("DyePalette tests", "") { setEnv("SDL_VIDEODRIVER", "dummy"); @@ -411,12 +402,3 @@ TEST_CASE("DyePalette tests", "") delete2(logger); // VirtFs::deinit(); } - -TEST_CASE("DyePalette leak test2", "") -{ - logger = new Logger(); - REQUIRE(gui == nullptr); - ResourceManager::cleanOrphans(true); - ResourceManager::deleteInstance(); - delete2(logger); -} diff --git a/src/unittests/resources/map/speciallayer.cc b/src/unittests/resources/map/speciallayer.cc index b5dcdcdbe..714074f33 100644 --- a/src/unittests/resources/map/speciallayer.cc +++ b/src/unittests/resources/map/speciallayer.cc @@ -47,15 +47,6 @@ #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", "") { setEnv("SDL_VIDEODRIVER", "dummy"); @@ -292,12 +283,3 @@ TEST_CASE("SpecialLayer updateCache", "") VirtFs::unmountDirSilent("../data"); delete2(logger); } - -TEST_CASE("SpecialLayer leak test2", "") -{ - logger = new Logger(); - REQUIRE(gui == nullptr); - ResourceManager::cleanOrphans(true); - ResourceManager::deleteInstance(); - delete2(logger); -} diff --git a/src/unittests/resources/resourcemanager/resourcemanager.cc b/src/unittests/resources/resourcemanager/resourcemanager.cc index d2e104472..232e940bc 100644 --- a/src/unittests/resources/resourcemanager/resourcemanager.cc +++ b/src/unittests/resources/resourcemanager/resourcemanager.cc @@ -89,15 +89,6 @@ namespace } // namespace -TEST_CASE("resourcemanager leak test1", "") -{ - logger = new Logger(); - REQUIRE(gui == nullptr); - ResourceManager::cleanOrphans(true); - ResourceManager::deleteInstance(); - delete2(logger); -} - TEST_CASE("resourcemanager", "resourcemanager") { setEnv("SDL_VIDEODRIVER", "dummy"); @@ -697,12 +688,3 @@ TEST_CASE("resourcemanager", "resourcemanager") delete2(logger); // VirtFs::deinit(); } - -TEST_CASE("resourcemanager leak test2", "") -{ - logger = new Logger(); - REQUIRE(gui == nullptr); - ResourceManager::cleanOrphans(true); - ResourceManager::deleteInstance(); - delete2(logger); -} diff --git a/src/unittests/resources/sprite/animatedsprite.cc b/src/unittests/resources/sprite/animatedsprite.cc index f05fd76dd..76e28bc7d 100644 --- a/src/unittests/resources/sprite/animatedsprite.cc +++ b/src/unittests/resources/sprite/animatedsprite.cc @@ -58,15 +58,6 @@ PRAGMA48(GCC diagnostic pop) #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"); @@ -209,12 +200,3 @@ 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); -} -- cgit v1.2.3-70-g09d2