summaryrefslogtreecommitdiff
path: root/src/gui/windowmanager_unittest.cc
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-04-07 02:48:12 +0300
committerAndrei Karas <akaras@inbox.ru>2017-04-08 16:46:28 +0300
commit27a2dd4fce2d529cd1d96aa5ddce1e74b4f54a2f (patch)
treec2c38e1b4f308ca885dc3c3581560cfbc6833a8e /src/gui/windowmanager_unittest.cc
parentd4e28aa97cbce34a0053d3c02cf070ef9065439f (diff)
downloadplus-27a2dd4fce2d529cd1d96aa5ddce1e74b4f54a2f.tar.gz
plus-27a2dd4fce2d529cd1d96aa5ddce1e74b4f54a2f.tar.bz2
plus-27a2dd4fce2d529cd1d96aa5ddce1e74b4f54a2f.tar.xz
plus-27a2dd4fce2d529cd1d96aa5ddce1e74b4f54a2f.zip
Move resourcemanager from class to namespace.
Diffstat (limited to 'src/gui/windowmanager_unittest.cc')
-rw-r--r--src/gui/windowmanager_unittest.cc24
1 files changed, 20 insertions, 4 deletions
diff --git a/src/gui/windowmanager_unittest.cc b/src/gui/windowmanager_unittest.cc
index 49ea9d97c..b19844ac9 100644
--- a/src/gui/windowmanager_unittest.cc
+++ b/src/gui/windowmanager_unittest.cc
@@ -130,6 +130,15 @@
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");
@@ -139,8 +148,7 @@ TEST_CASE("Windows tests", "windowmanager")
SDL_Init(SDL_INIT_VIDEO);
logger = new Logger();
ResourceManager::deleteInstance();
- ResourceManager::init();
- resourceManager->cleanOrphans(true);
+ ResourceManager::cleanOrphans(true);
VirtFs::mountDirSilent("data", Append_false);
VirtFs::mountDirSilent("../data", Append_false);
VirtFs::mountDirSilent("data/test", Append_false);
@@ -723,8 +731,7 @@ TEST_CASE("WindowManager", "create windows")
SDL_Init(SDL_INIT_VIDEO);
logger = new Logger();
ResourceManager::deleteInstance();
- ResourceManager::init();
- resourceManager->cleanOrphans(true);
+ ResourceManager::cleanOrphans(true);
VirtFs::mountDirSilent("data", Append_false);
VirtFs::mountDirSilent("../data", Append_false);
VirtFs::mountDirSilent("data/test", Append_false);
@@ -869,3 +876,12 @@ 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);
+}