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/gui/widgets/browserbox.cc | 18 ------------------ src/unittests/gui/windowmanager.cc | 18 ------------------ src/unittests/integrity.cc | 18 ------------------ 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 ------------------ src/unittests/sdl.cc | 18 ------------------ src/unittests/utils/chatutils.cc | 18 ------------------ src/unittests/utils/translation/poparser.cc | 18 ------------------ src/unittests/utils/xmlutils.cc | 18 ------------------ 12 files changed, 216 deletions(-) (limited to 'src/unittests') diff --git a/src/unittests/gui/widgets/browserbox.cc b/src/unittests/gui/widgets/browserbox.cc index 8f97a6984..d73ad06f3 100644 --- a/src/unittests/gui/widgets/browserbox.cc +++ b/src/unittests/gui/widgets/browserbox.cc @@ -47,15 +47,6 @@ #include "debug.h" -TEST_CASE("BrowserBox leak test1", "") -{ - logger = new Logger(); - REQUIRE(gui == nullptr); - ResourceManager::cleanOrphans(true); - ResourceManager::deleteInstance(); - delete2(logger); -} - TEST_CASE("BrowserBox tests", "browserbox") { setEnv("SDL_VIDEODRIVER", "dummy"); @@ -200,12 +191,3 @@ TEST_CASE("BrowserBox tests", "browserbox") delete2(logger); // VirtFs::deinit(); } - -TEST_CASE("BrowserBox leak test2", "") -{ - logger = new Logger(); - REQUIRE(gui == nullptr); - ResourceManager::cleanOrphans(true); - ResourceManager::deleteInstance(); - delete2(logger); -} diff --git a/src/unittests/gui/windowmanager.cc b/src/unittests/gui/windowmanager.cc index 0bf21a97d..9c04237a6 100644 --- a/src/unittests/gui/windowmanager.cc +++ b/src/unittests/gui/windowmanager.cc @@ -139,15 +139,6 @@ 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"); @@ -987,12 +978,3 @@ 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); -} diff --git a/src/unittests/integrity.cc b/src/unittests/integrity.cc index 9da17cf84..02682f537 100644 --- a/src/unittests/integrity.cc +++ b/src/unittests/integrity.cc @@ -107,15 +107,6 @@ static bool compareBuffers(const unsigned char *const buf2) return isCorrect; } -TEST_CASE("integrity leak test1", "") -{ - logger = new Logger(); - REQUIRE(gui == nullptr); - ResourceManager::cleanOrphans(true); - ResourceManager::deleteInstance(); - delete2(logger); -} - TEST_CASE("integrity tests", "integrity") { setEnv("SDL_VIDEODRIVER", "dummy"); @@ -367,12 +358,3 @@ TEST_CASE("integrity tests", "integrity") delete2(logger); // VirtFs::deinit(); } - -TEST_CASE("integrity leak test2", "") -{ - logger = new Logger(); - REQUIRE(gui == nullptr); - ResourceManager::cleanOrphans(true); - ResourceManager::deleteInstance(); - delete2(logger); -} 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); -} diff --git a/src/unittests/sdl.cc b/src/unittests/sdl.cc index b75b9a453..d5026a583 100644 --- a/src/unittests/sdl.cc +++ b/src/unittests/sdl.cc @@ -55,15 +55,6 @@ PRAGMA48(GCC diagnostic pop) #include "debug.h" -TEST_CASE("sdl leak test1", "") -{ - logger = new Logger(); - REQUIRE(gui == nullptr); - ResourceManager::cleanOrphans(true); - ResourceManager::deleteInstance(); - delete2(logger); -} - TEST_CASE("sdl tests", "sdl") { setEnv("SDL_VIDEODRIVER", "dummy"); @@ -412,12 +403,3 @@ TEST_CASE("sdl tests", "sdl") delete2(logger); // VirtFs::deinit(); } - -TEST_CASE("sdl leak test2", "") -{ - logger = new Logger(); - REQUIRE(gui == nullptr); - ResourceManager::cleanOrphans(true); - ResourceManager::deleteInstance(); - delete2(logger); -} diff --git a/src/unittests/utils/chatutils.cc b/src/unittests/utils/chatutils.cc index 69e79db27..64c655f57 100644 --- a/src/unittests/utils/chatutils.cc +++ b/src/unittests/utils/chatutils.cc @@ -55,15 +55,6 @@ PRAGMA48(GCC diagnostic pop) #include "debug.h" -TEST_CASE("chatutils leak test1", "") -{ - logger = new Logger(); - REQUIRE(gui == nullptr); - ResourceManager::cleanOrphans(true); - ResourceManager::deleteInstance(); - delete2(logger); -} - TEST_CASE("chatutils replaceVars", "") { setEnv("SDL_VIDEODRIVER", "dummy"); @@ -276,12 +267,3 @@ TEST_CASE("chatutils textToMe", "") REQUIRE(textToMe("*") == "***"); REQUIRE(textToMe("test line") == "*test line*"); } - -TEST_CASE("chatutils leak test2", "") -{ - logger = new Logger(); - REQUIRE(gui == nullptr); - ResourceManager::cleanOrphans(true); - ResourceManager::deleteInstance(); - delete2(logger); -} diff --git a/src/unittests/utils/translation/poparser.cc b/src/unittests/utils/translation/poparser.cc index a299617e9..bca391ee6 100644 --- a/src/unittests/utils/translation/poparser.cc +++ b/src/unittests/utils/translation/poparser.cc @@ -47,15 +47,6 @@ #include "debug.h" -TEST_CASE("PoParser leak test1", "") -{ - logger = new Logger(); - REQUIRE(gui == nullptr); - ResourceManager::cleanOrphans(true); - ResourceManager::deleteInstance(); - delete2(logger); -} - TEST_CASE("PoParser tests", "PoParser") { setEnv("SDL_VIDEODRIVER", "dummy"); @@ -147,12 +138,3 @@ TEST_CASE("PoParser tests", "PoParser") delete2(logger); // VirtFs::deinit(); } - -TEST_CASE("PoParser leak test2", "") -{ - logger = new Logger(); - REQUIRE(gui == nullptr); - ResourceManager::cleanOrphans(true); - ResourceManager::deleteInstance(); - delete2(logger); -} diff --git a/src/unittests/utils/xmlutils.cc b/src/unittests/utils/xmlutils.cc index 526ed216e..7a82a502c 100644 --- a/src/unittests/utils/xmlutils.cc +++ b/src/unittests/utils/xmlutils.cc @@ -44,15 +44,6 @@ #include "debug.h" -TEST_CASE("xmlutils leak test1", "") -{ - logger = new Logger(); - REQUIRE(gui == nullptr); - ResourceManager::cleanOrphans(true); - ResourceManager::deleteInstance(); - delete2(logger); -} - TEST_CASE("xmlutils readXmlIntVector 1", "") { setEnv("SDL_VIDEODRIVER", "dummy"); @@ -225,12 +216,3 @@ TEST_CASE("xmlutils readXmlIntMap 1", "") delete2(logger); // VirtFs::deinit(); } - -TEST_CASE("xmlutils leak test2", "") -{ - logger = new Logger(); - REQUIRE(gui == nullptr); - ResourceManager::cleanOrphans(true); - ResourceManager::deleteInstance(); - delete2(logger); -} -- cgit v1.2.3-60-g2f50