diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-03-01 04:50:26 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-03-01 04:50:26 +0300 |
| commit | 7df01a8695e46e7e8cce603782f0e16caf54169b (patch) | |
| tree | 030a0125429c9605c24ad74e3d523fd900f155cd /src/utils/xmlutils_unittest.cc | |
| parent | 0f172abb004bed203f8bf329e4f43eb174a8a58c (diff) | |
| download | manaplus-7df01a8695e46e7e8cce603782f0e16caf54169b.tar.gz manaplus-7df01a8695e46e7e8cce603782f0e16caf54169b.tar.bz2 manaplus-7df01a8695e46e7e8cce603782f0e16caf54169b.tar.xz manaplus-7df01a8695e46e7e8cce603782f0e16caf54169b.zip | |
Fix tests running without physfs.
Diffstat (limited to 'src/utils/xmlutils_unittest.cc')
| -rw-r--r-- | src/utils/xmlutils_unittest.cc | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/src/utils/xmlutils_unittest.cc b/src/utils/xmlutils_unittest.cc index b3b9cba81..dff0b130c 100644 --- a/src/utils/xmlutils_unittest.cc +++ b/src/utils/xmlutils_unittest.cc @@ -45,6 +45,8 @@ TEST_CASE("xmlutils readXmlIntVector 1") XML::initXML(); logger = new Logger(); ResourceManager::init(); + VirtFs::addDirToSearchPath("data", Append_false); + VirtFs::addDirToSearchPath("../data", Append_false); mainGraphics = new SDLGraphics; imageHelper = new SDLImageHelper(); @@ -59,9 +61,6 @@ TEST_CASE("xmlutils readXmlIntVector 1") ActorSprite::load(); - VirtFs::addDirToSearchPath("data", Append_false); - VirtFs::addDirToSearchPath("../data", Append_false); - std::vector<int> arr; readXmlIntVector("graphics/gui/browserbox.xml", @@ -80,6 +79,8 @@ TEST_CASE("xmlutils readXmlIntVector 1") REQUIRE(1 == arr[4]); delete2(client); ResourceManager::deleteInstance(); + VirtFs::removeDirFromSearchPath("data"); + VirtFs::removeDirFromSearchPath("../data"); delete2(logger); // VirtFs::deinit(); } @@ -91,6 +92,8 @@ TEST_CASE("xmlutils readXmlStringMap 1") XML::initXML(); logger = new Logger(); ResourceManager::init(); + VirtFs::addDirToSearchPath("data", Append_false); + VirtFs::addDirToSearchPath("../data", Append_false); mainGraphics = new SDLGraphics; imageHelper = new SDLImageHelper(); @@ -105,9 +108,6 @@ TEST_CASE("xmlutils readXmlStringMap 1") ActorSprite::load(); - VirtFs::addDirToSearchPath("data", Append_false); - VirtFs::addDirToSearchPath("../data", Append_false); - std::map<std::string, std::string> arr; readXmlStringMap("graphics/sprites/manaplus_emotes.xml", @@ -125,6 +125,8 @@ TEST_CASE("xmlutils readXmlStringMap 1") REQUIRE(arr["Metal"] == "26"); delete2(client); ResourceManager::deleteInstance(); + VirtFs::removeDirFromSearchPath("data"); + VirtFs::removeDirFromSearchPath("../data"); delete2(logger); // VirtFs::deinit(); } @@ -136,6 +138,10 @@ TEST_CASE("xmlutils readXmlIntMap 1") XML::initXML(); logger = new Logger(); ResourceManager::init(); + VirtFs::addDirToSearchPath("data", Append_false); + VirtFs::addDirToSearchPath("../data", Append_false); + VirtFs::addDirToSearchPath("data/test", Append_false); + VirtFs::addDirToSearchPath("../data/test", Append_false); mainGraphics = new SDLGraphics; imageHelper = new SDLImageHelper(); @@ -150,9 +156,6 @@ TEST_CASE("xmlutils readXmlIntMap 1") ActorSprite::load(); - VirtFs::addDirToSearchPath("data/test", Append_false); - VirtFs::addDirToSearchPath("../data/test", Append_false); - std::map<int32_t, int32_t> arr; readXmlIntMap("testintmap.xml", @@ -170,6 +173,10 @@ TEST_CASE("xmlutils readXmlIntMap 1") REQUIRE(arr[3] == 0); delete2(client); ResourceManager::deleteInstance(); + VirtFs::removeDirFromSearchPath("data/test"); + VirtFs::removeDirFromSearchPath("../data/test"); + VirtFs::removeDirFromSearchPath("data"); + VirtFs::removeDirFromSearchPath("../data"); delete2(logger); // VirtFs::deinit(); } |