summaryrefslogtreecommitdiff
path: root/src/unittests/gui
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/gui
parent429a545dbd5d0fa992394cf7f4c83d5e972a14b2 (diff)
downloadManaVerse-d88285ef4d2b624a0c6a8ef5c2e157ed0248838e.tar.gz
ManaVerse-d88285ef4d2b624a0c6a8ef5c2e157ed0248838e.tar.bz2
ManaVerse-d88285ef4d2b624a0c6a8ef5c2e157ed0248838e.tar.xz
ManaVerse-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/gui')
-rw-r--r--src/unittests/gui/widgets/browserbox.cc3
-rw-r--r--src/unittests/gui/windowmanager.cc8
2 files changed, 0 insertions, 11 deletions
diff --git a/src/unittests/gui/widgets/browserbox.cc b/src/unittests/gui/widgets/browserbox.cc
index 7e4689707..88f2f8b92 100644
--- a/src/unittests/gui/widgets/browserbox.cc
+++ b/src/unittests/gui/widgets/browserbox.cc
@@ -50,7 +50,6 @@ TEST_CASE("BrowserBox tests", "browserbox")
setEnv("SDL_VIDEODRIVER", "dummy");
client = new Client;
- logger = new Logger();
VirtFs::mountDirSilent("data", Append_false);
VirtFs::mountDirSilent("../data", Append_false);
@@ -186,6 +185,4 @@ TEST_CASE("BrowserBox tests", "browserbox")
delete2(client);
VirtFs::unmountDirSilent("data");
VirtFs::unmountDirSilent("../data");
- delete2(logger);
-// VirtFs::deinit();
}
diff --git a/src/unittests/gui/windowmanager.cc b/src/unittests/gui/windowmanager.cc
index 108ae18d0..bed0de6a1 100644
--- a/src/unittests/gui/windowmanager.cc
+++ b/src/unittests/gui/windowmanager.cc
@@ -146,7 +146,6 @@ TEST_CASE("Windows tests", "windowmanager")
client = new Client;
XML::initXML();
SDL_Init(SDL_INIT_VIDEO);
- logger = new Logger();
ResourceManager::deleteInstance();
ResourceManager::cleanOrphans(true);
VirtFs::mountDirSilent("data", Append_false);
@@ -819,9 +818,6 @@ TEST_CASE("Windows tests", "windowmanager")
VirtFs::unmountDirSilent("../data");
VirtFs::unmountDirSilent("data/test");
VirtFs::unmountDirSilent("../data/test");
- delete2(logger);
-
-// VirtFs::deinit();
}
TEST_CASE("WindowManager", "create windows")
@@ -831,7 +827,6 @@ TEST_CASE("WindowManager", "create windows")
client = new Client;
XML::initXML();
SDL_Init(SDL_INIT_VIDEO);
- logger = new Logger();
ResourceManager::deleteInstance();
ResourceManager::cleanOrphans(true);
VirtFs::mountDirSilent("data", Append_false);
@@ -977,7 +972,4 @@ TEST_CASE("WindowManager", "create windows")
VirtFs::unmountDirSilent("../data");
VirtFs::unmountDirSilent("data/test");
VirtFs::unmountDirSilent("../data/test");
- delete2(logger);
-
-// VirtFs::deinit();
}