diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-03-09 03:31:42 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-03-09 03:31:42 +0300 |
| commit | 612873fa462d74a31bdd3977dac7919376038275 (patch) | |
| tree | 86c7ce3cb5a0d334bcba5d463846a88e03a8669e /src/utils/xmlutils_unittest.cc | |
| parent | 8470d3c82d84a6bd7767de6763153aa9cdfb991b (diff) | |
| download | manaverse-612873fa462d74a31bdd3977dac7919376038275.tar.gz manaverse-612873fa462d74a31bdd3977dac7919376038275.tar.bz2 manaverse-612873fa462d74a31bdd3977dac7919376038275.tar.xz manaverse-612873fa462d74a31bdd3977dac7919376038275.zip | |
Simplify add/remove dirs and zips methods in virtfs.
Diffstat (limited to 'src/utils/xmlutils_unittest.cc')
| -rw-r--r-- | src/utils/xmlutils_unittest.cc | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/utils/xmlutils_unittest.cc b/src/utils/xmlutils_unittest.cc index b28d3ec9d..41096bc05 100644 --- a/src/utils/xmlutils_unittest.cc +++ b/src/utils/xmlutils_unittest.cc @@ -44,8 +44,8 @@ TEST_CASE("xmlutils readXmlIntVector 1") XML::initXML(); logger = new Logger(); ResourceManager::init(); - VirtFs::addDirToSearchPathSilent("data", Append_false); - VirtFs::addDirToSearchPathSilent("../data", Append_false); + VirtFs::mountDirSilent("data", Append_false); + VirtFs::mountDirSilent("../data", Append_false); mainGraphics = new SDLGraphics; imageHelper = new SDLImageHelper(); @@ -78,8 +78,8 @@ TEST_CASE("xmlutils readXmlIntVector 1") REQUIRE(1 == arr[4]); delete2(client); ResourceManager::deleteInstance(); - VirtFs::removeDirFromSearchPathSilent("data"); - VirtFs::removeDirFromSearchPathSilent("../data"); + VirtFs::unmountDirSilent("data"); + VirtFs::unmountDirSilent("../data"); delete2(logger); // VirtFs::deinit(); } @@ -90,8 +90,8 @@ TEST_CASE("xmlutils readXmlStringMap 1") XML::initXML(); logger = new Logger(); ResourceManager::init(); - VirtFs::addDirToSearchPathSilent("data", Append_false); - VirtFs::addDirToSearchPathSilent("../data", Append_false); + VirtFs::mountDirSilent("data", Append_false); + VirtFs::mountDirSilent("../data", Append_false); mainGraphics = new SDLGraphics; imageHelper = new SDLImageHelper(); @@ -123,8 +123,8 @@ TEST_CASE("xmlutils readXmlStringMap 1") REQUIRE(arr["Metal"] == "26"); delete2(client); ResourceManager::deleteInstance(); - VirtFs::removeDirFromSearchPathSilent("data"); - VirtFs::removeDirFromSearchPathSilent("../data"); + VirtFs::unmountDirSilent("data"); + VirtFs::unmountDirSilent("../data"); delete2(logger); // VirtFs::deinit(); } @@ -135,10 +135,10 @@ TEST_CASE("xmlutils readXmlIntMap 1") XML::initXML(); logger = new Logger(); ResourceManager::init(); - VirtFs::addDirToSearchPathSilent("data", Append_false); - VirtFs::addDirToSearchPathSilent("../data", Append_false); - VirtFs::addDirToSearchPathSilent("data/test", Append_false); - VirtFs::addDirToSearchPathSilent("../data/test", Append_false); + VirtFs::mountDirSilent("data", Append_false); + VirtFs::mountDirSilent("../data", Append_false); + VirtFs::mountDirSilent("data/test", Append_false); + VirtFs::mountDirSilent("../data/test", Append_false); mainGraphics = new SDLGraphics; imageHelper = new SDLImageHelper(); @@ -170,10 +170,10 @@ TEST_CASE("xmlutils readXmlIntMap 1") REQUIRE(arr[3] == 0); delete2(client); ResourceManager::deleteInstance(); - VirtFs::removeDirFromSearchPathSilent("data/test"); - VirtFs::removeDirFromSearchPathSilent("../data/test"); - VirtFs::removeDirFromSearchPathSilent("data"); - VirtFs::removeDirFromSearchPathSilent("../data"); + VirtFs::unmountDirSilent("data/test"); + VirtFs::unmountDirSilent("../data/test"); + VirtFs::unmountDirSilent("data"); + VirtFs::unmountDirSilent("../data"); delete2(logger); // VirtFs::deinit(); } |