summaryrefslogtreecommitdiff
path: root/src/unittests/fs/virtfs/throw.cc
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-09-12 18:47:07 +0300
committerAndrei Karas <akaras@inbox.ru>2017-09-12 18:47:07 +0300
commitd88285ef4d2b624a0c6a8ef5c2e157ed0248838e (patch)
tree21c77124f72c023590f0d1b0426eb9357305201e /src/unittests/fs/virtfs/throw.cc
parent429a545dbd5d0fa992394cf7f4c83d5e972a14b2 (diff)
downloadmv-d88285ef4d2b624a0c6a8ef5c2e157ed0248838e.tar.gz
mv-d88285ef4d2b624a0c6a8ef5c2e157ed0248838e.tar.bz2
mv-d88285ef4d2b624a0c6a8ef5c2e157ed0248838e.tar.xz
mv-d88285ef4d2b624a0c6a8ef5c2e157ed0248838e.zip
Create logger in unit tests before other code.
This need because now sdl may raise error or assert almost at start.
Diffstat (limited to 'src/unittests/fs/virtfs/throw.cc')
-rw-r--r--src/unittests/fs/virtfs/throw.cc18
1 files changed, 0 insertions, 18 deletions
diff --git a/src/unittests/fs/virtfs/throw.cc b/src/unittests/fs/virtfs/throw.cc
index d510f47e0..9f0a18f32 100644
--- a/src/unittests/fs/virtfs/throw.cc
+++ b/src/unittests/fs/virtfs/throw.cc
@@ -28,7 +28,6 @@
#include "fs/virtfs/zipreader.h"
#include "utils/checkutils.h"
-#include "utils/delete2.h"
#ifndef UNITTESTS_CATCH
#include <algorithm>
@@ -39,7 +38,6 @@
TEST_CASE("throw VirtFs1 exists1", "")
{
VirtFs::init(".");
- logger = new Logger();
const bool dir1 = VirtFs::mountDirSilent("data/",
Append_false);
VirtFs::mountDirSilent("..\\data",
@@ -64,13 +62,11 @@ TEST_CASE("throw VirtFs1 exists1", "")
REQUIRE_THROWS(VirtFs::exists("test/../units.xml"));
VirtFs::deinit();
- delete2(logger);
}
TEST_CASE("throw VirtFs1 exists2", "")
{
VirtFs::init(".");
- logger = new Logger();
const bool dir1 = VirtFs::mountDirSilent2("data/",
"test",
Append_false);
@@ -99,36 +95,27 @@ TEST_CASE("throw VirtFs1 exists2", "")
REQUIRE_THROWS(VirtFs::exists("test/../units.xml"));
VirtFs::deinit();
- delete2(logger);
}
TEST_CASE("throw Zip readCompressedFile", "")
{
- logger = new Logger();
SECTION("empty")
{
REQUIRE_THROWS(VirtFs::ZipReader::readCompressedFile(nullptr));
}
-
- delete2(logger);
}
TEST_CASE("throw Zip readFile", "")
{
- logger = new Logger();
-
SECTION("empty")
{
REQUIRE_THROWS(VirtFs::ZipReader::readFile(nullptr));
}
-
- delete2(logger);
}
TEST_CASE("throw VirtFs1 unmount", "")
{
VirtFs::init(".");
- logger = new Logger();
const std::string sep = dirSeparator;
SECTION("simple 1")
@@ -218,13 +205,10 @@ TEST_CASE("throw VirtFs1 unmount", "")
}
VirtFs::deinit();
- delete2(logger);
}
TEST_CASE("throw configuration tests", "configuration")
{
- logger = new Logger();
-
Dirs::initRootDir();
Dirs::initHomeDir();
@@ -238,6 +222,4 @@ TEST_CASE("throw configuration tests", "configuration")
REQUIRE_THROWS(config.getStringValue(key));
REQUIRE_THROWS(config.getBoolValue(key));
}
-
- delete2(logger);
}