summaryrefslogtreecommitdiff
path: root/src/gui/windowmanager_unittest.cc
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-03-04 00:27:54 +0300
committerAndrei Karas <akaras@inbox.ru>2017-03-04 01:12:19 +0300
commit79bb654b80d5eb7a65814f80b9ca7ca1ccd62a00 (patch)
treef9669ee10e2ea3f2c41abaa84830da9efe7f9411 /src/gui/windowmanager_unittest.cc
parenta6c70dd1f32c38cc81cfd4b28f929d7c13d86db1 (diff)
downloadplus-79bb654b80d5eb7a65814f80b9ca7ca1ccd62a00.tar.gz
plus-79bb654b80d5eb7a65814f80b9ca7ca1ccd62a00.tar.bz2
plus-79bb654b80d5eb7a65814f80b9ca7ca1ccd62a00.tar.xz
plus-79bb654b80d5eb7a65814f80b9ca7ca1ccd62a00.zip
Reimplement VirtFs in correct way. Now all tests should pass.
Diffstat (limited to 'src/gui/windowmanager_unittest.cc')
-rw-r--r--src/gui/windowmanager_unittest.cc16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/windowmanager_unittest.cc b/src/gui/windowmanager_unittest.cc
index 38471370d..58f85ec2a 100644
--- a/src/gui/windowmanager_unittest.cc
+++ b/src/gui/windowmanager_unittest.cc
@@ -139,10 +139,10 @@ TEST_CASE("Windows tests", "windowmanager")
resourceManager = nullptr;
ResourceManager::init();
resourceManager->cleanOrphans(true);
- VirtFs::addDirToSearchPath("data", Append_false);
- VirtFs::addDirToSearchPath("../data", Append_false);
- VirtFs::addDirToSearchPath("data/test", Append_false);
- VirtFs::addDirToSearchPath("../data/test", Append_false);
+ VirtFs::addDirToSearchPathSilent("data", Append_false);
+ VirtFs::addDirToSearchPathSilent("../data", Append_false);
+ VirtFs::addDirToSearchPathSilent("data/test", Append_false);
+ VirtFs::addDirToSearchPathSilent("../data/test", Append_false);
paths.setDefaultValues(getPathsDefaults());
branding.setValue("onlineServerFile", "test/serverlistplus.xml");
mainGraphics = new SDLGraphics;
@@ -690,10 +690,10 @@ TEST_CASE("Windows tests", "windowmanager")
delete2(inventoryHandler);
delete2(charServerHandler);
delete2(playerHandler);
- VirtFs::removeDirFromSearchPath("data");
- VirtFs::removeDirFromSearchPath("../data");
- VirtFs::removeDirFromSearchPath("data/test");
- VirtFs::removeDirFromSearchPath("../data/test");
+ VirtFs::removeDirFromSearchPathSilent("data");
+ VirtFs::removeDirFromSearchPathSilent("../data");
+ VirtFs::removeDirFromSearchPathSilent("data/test");
+ VirtFs::removeDirFromSearchPathSilent("../data/test");
delete2(logger);
// VirtFs::deinit();