diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-03-04 00:27:54 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-03-04 01:12:19 +0300 |
| commit | 79bb654b80d5eb7a65814f80b9ca7ca1ccd62a00 (patch) | |
| tree | f9669ee10e2ea3f2c41abaa84830da9efe7f9411 /src/gui | |
| parent | a6c70dd1f32c38cc81cfd4b28f929d7c13d86db1 (diff) | |
| download | plus-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')
| -rw-r--r-- | src/gui/widgets/browserbox_unittest.cc | 8 | ||||
| -rw-r--r-- | src/gui/windowmanager_unittest.cc | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/gui/widgets/browserbox_unittest.cc b/src/gui/widgets/browserbox_unittest.cc index 0dd8af585..485c67ca4 100644 --- a/src/gui/widgets/browserbox_unittest.cc +++ b/src/gui/widgets/browserbox_unittest.cc @@ -50,8 +50,8 @@ TEST_CASE("BrowserBox tests", "browserbox") client = new Client; logger = new Logger(); ResourceManager::init(); - VirtFs::addDirToSearchPath("data", Append_false); - VirtFs::addDirToSearchPath("../data", Append_false); + VirtFs::addDirToSearchPathSilent("data", Append_false); + VirtFs::addDirToSearchPathSilent("../data", Append_false); mainGraphics = new SDLGraphics; imageHelper = new SDLImageHelper; @@ -175,8 +175,8 @@ TEST_CASE("BrowserBox tests", "browserbox") Widget::setGlobalFont(nullptr); delete box; delete2(client); - VirtFs::removeDirFromSearchPath("data"); - VirtFs::removeDirFromSearchPath("../data"); + VirtFs::removeDirFromSearchPathSilent("data"); + VirtFs::removeDirFromSearchPathSilent("../data"); delete2(logger); // VirtFs::deinit(); } 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(); |