diff options
Diffstat (limited to 'src/unittests/utils')
-rw-r--r-- | src/unittests/utils/chatutils.cc | 3 | ||||
-rw-r--r-- | src/unittests/utils/checkutils.cc | 5 | ||||
-rw-r--r-- | src/unittests/utils/dumplibs.cc | 7 | ||||
-rw-r--r-- | src/unittests/utils/stringutils.cc | 5 | ||||
-rw-r--r-- | src/unittests/utils/translation/poparser.cc | 3 | ||||
-rw-r--r-- | src/unittests/utils/xml.cc | 8 | ||||
-rw-r--r-- | src/unittests/utils/xmlutils.cc | 9 |
7 files changed, 0 insertions, 40 deletions
diff --git a/src/unittests/utils/chatutils.cc b/src/unittests/utils/chatutils.cc index f0a72af26..56e08a8ce 100644 --- a/src/unittests/utils/chatutils.cc +++ b/src/unittests/utils/chatutils.cc @@ -60,7 +60,6 @@ TEST_CASE("chatutils replaceVars", "") client = new Client; XML::initXML(); SDL_Init(SDL_INIT_VIDEO); - logger = new Logger(); VirtFs::mountDirSilent("data", Append_false); VirtFs::mountDirSilent("../data", Append_false); imageHelper = new SDLImageHelper(); @@ -255,8 +254,6 @@ TEST_CASE("chatutils replaceVars", "") delete2(client); VirtFs::unmountDirSilent("data"); VirtFs::unmountDirSilent("../data"); - delete2(logger); -// VirtFs::deinit(); } TEST_CASE("chatutils textToMe", "") diff --git a/src/unittests/utils/checkutils.cc b/src/unittests/utils/checkutils.cc index c54dcf9fc..5cfec4e83 100644 --- a/src/unittests/utils/checkutils.cc +++ b/src/unittests/utils/checkutils.cc @@ -21,7 +21,6 @@ #include "unittests/unittests.h" #include "utils/checkutils.h" -#include "utils/delete2.h" #include "debug.h" @@ -83,8 +82,6 @@ static bool testFailAlways2() TEST_CASE("CheckUtils", "") { - logger = new Logger; - SECTION("reportFalse") { REQUIRE(reportFalseReal(false) == false); @@ -174,6 +171,4 @@ PRAGMA4(GCC diagnostic pop) testReturnNullptrV(reinterpret_cast<void*>(1)); REQUIRE(flag == true); } - - delete2(logger); } diff --git a/src/unittests/utils/dumplibs.cc b/src/unittests/utils/dumplibs.cc index 35b80c710..e5797d45f 100644 --- a/src/unittests/utils/dumplibs.cc +++ b/src/unittests/utils/dumplibs.cc @@ -20,9 +20,6 @@ #include "unittests/unittests.h" -#include "logger.h" - -#include "utils/delete2.h" #include "utils/stringutils.h" PRAGMA48(GCC diagnostic push) @@ -42,8 +39,6 @@ PRAGMA48(GCC diagnostic pop) TEST_CASE("dumplibs tests", "") { - logger = new Logger(); - SECTION("zlib") { const std::string build = ZLIB_VERSION; @@ -140,6 +135,4 @@ TEST_CASE("dumplibs tests", "") REQUIRE(build == link); } - - delete2(logger); } diff --git a/src/unittests/utils/stringutils.cc b/src/unittests/utils/stringutils.cc index 128b07078..e69ebecba 100644 --- a/src/unittests/utils/stringutils.cc +++ b/src/unittests/utils/stringutils.cc @@ -21,13 +21,11 @@ #include "unittests/unittests.h" #include "configuration.h" -#include "logger.h" #include "const/utils/utf8.h" #include "fs/virtfs/fs.h" -#include "utils/delete2.h" #include "utils/dtor.h" #include "resources/iteminfo.h" @@ -1486,7 +1484,6 @@ TEST_CASE("stringuntils timeDiffToString", "") TEST_CASE("stringuntils replaceItemLinks", "") { - logger = new Logger(); VirtFs::mountDirSilent("data", Append_false); VirtFs::mountDirSilent("../data", Append_false); VirtFs::mountDirSilent("data/test", Append_false); @@ -1715,6 +1712,4 @@ TEST_CASE("stringuntils replaceItemLinks", "") VirtFs::unmountDirSilent("../data"); VirtFs::unmountDirSilent("data/test"); VirtFs::unmountDirSilent("../data/test"); - delete2(logger); -// VirtFs::deinit(); } diff --git a/src/unittests/utils/translation/poparser.cc b/src/unittests/utils/translation/poparser.cc index 84c993112..cfa0cbb30 100644 --- a/src/unittests/utils/translation/poparser.cc +++ b/src/unittests/utils/translation/poparser.cc @@ -50,7 +50,6 @@ TEST_CASE("PoParser tests", "PoParser") setEnv("SDL_VIDEODRIVER", "dummy"); client = new Client; - logger = new Logger(); VirtFs::mountDirSilent("data", Append_false); VirtFs::mountDirSilent("../data", Append_false); @@ -133,6 +132,4 @@ TEST_CASE("PoParser tests", "PoParser") delete2(client); VirtFs::unmountDirSilent("data"); VirtFs::unmountDirSilent("../data"); - delete2(logger); -// VirtFs::deinit(); } diff --git a/src/unittests/utils/xml.cc b/src/unittests/utils/xml.cc index f27b65597..6f380cfaf 100644 --- a/src/unittests/utils/xml.cc +++ b/src/unittests/utils/xml.cc @@ -49,19 +49,16 @@ TEST_CASE("xml test1", "") { - logger = new Logger(); REQUIRE(client == nullptr); REQUIRE(gui == nullptr); ResourceManager::cleanOrphans(true); ResourceManager::deleteInstance(); - delete2(logger); } TEST_CASE("xml doc", "") { setEnv("SDL_VIDEODRIVER", "dummy"); - logger = new Logger(); client = new Client; XML::initXML(); VirtFs::mountDirSilent("data", Append_false); @@ -385,16 +382,11 @@ TEST_CASE("xml doc", "") ResourceManager::deleteInstance(); VirtFs::unmountDirSilent("data"); VirtFs::unmountDirSilent("../data"); - - delete2(logger); -// VirtFs::deinit(); } TEST_CASE("xml 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 bff998057..e665cb6e5 100644 --- a/src/unittests/utils/xmlutils.cc +++ b/src/unittests/utils/xmlutils.cc @@ -51,7 +51,6 @@ TEST_CASE("xmlutils readXmlIntVector 1", "") client = new Client; XML::initXML(); - logger = new Logger(); VirtFs::mountDirSilent("data", Append_false); VirtFs::mountDirSilent("../data", Append_false); @@ -102,8 +101,6 @@ TEST_CASE("xmlutils readXmlIntVector 1", "") ResourceManager::deleteInstance(); VirtFs::unmountDirSilent("data"); VirtFs::unmountDirSilent("../data"); - delete2(logger); -// VirtFs::deinit(); } TEST_CASE("xmlutils readXmlStringMap 1", "") @@ -112,7 +109,6 @@ TEST_CASE("xmlutils readXmlStringMap 1", "") client = new Client; XML::initXML(); - logger = new Logger(); VirtFs::mountDirSilent("data", Append_false); VirtFs::mountDirSilent("../data", Append_false); @@ -162,8 +158,6 @@ TEST_CASE("xmlutils readXmlStringMap 1", "") ResourceManager::deleteInstance(); VirtFs::unmountDirSilent("data"); VirtFs::unmountDirSilent("../data"); - delete2(logger); -// VirtFs::deinit(); } TEST_CASE("xmlutils readXmlIntMap 1", "") @@ -172,7 +166,6 @@ TEST_CASE("xmlutils readXmlIntMap 1", "") client = new Client; XML::initXML(); - logger = new Logger(); VirtFs::mountDirSilent("data", Append_false); VirtFs::mountDirSilent("../data", Append_false); VirtFs::mountDirSilent("data/test", Append_false); @@ -226,6 +219,4 @@ TEST_CASE("xmlutils readXmlIntMap 1", "") VirtFs::unmountDirSilent("../data/test"); VirtFs::unmountDirSilent("data"); VirtFs::unmountDirSilent("../data"); - delete2(logger); -// VirtFs::deinit(); } |