summaryrefslogtreecommitdiff
path: root/src/utils
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-03-02 05:18:37 +0300
committerAndrei Karas <akaras@inbox.ru>2017-03-02 05:18:37 +0300
commit22a2c48a263c67ab3418c22a88cec67e5c1d318c (patch)
tree5e1685b0ec799dcaf52dd87bafbdafe7421943f9 /src/utils
parent4b1ca08f26152fbcfb5eb838d271fdd88c381eca (diff)
downloadmv-22a2c48a263c67ab3418c22a88cec67e5c1d318c.tar.gz
mv-22a2c48a263c67ab3418c22a88cec67e5c1d318c.tar.bz2
mv-22a2c48a263c67ab3418c22a88cec67e5c1d318c.tar.xz
mv-22a2c48a263c67ab3418c22a88cec67e5c1d318c.zip
Fix tests failure in physfs deinit.
Diffstat (limited to 'src/utils')
-rw-r--r--src/utils/chatutils_unittest.cc2
-rw-r--r--src/utils/translation/poparser_unittest.cc2
-rw-r--r--src/utils/xml_unittest.cc3
-rw-r--r--src/utils/xmlutils_unittest.cc6
4 files changed, 6 insertions, 7 deletions
diff --git a/src/utils/chatutils_unittest.cc b/src/utils/chatutils_unittest.cc
index 421798227..9f1188bd0 100644
--- a/src/utils/chatutils_unittest.cc
+++ b/src/utils/chatutils_unittest.cc
@@ -237,9 +237,9 @@ TEST_CASE("chatutils replaceVars")
delete2(actorManager);
delete2(localPlayer);
- delete2(client);
VirtFs::removeDirFromSearchPath("data");
VirtFs::removeDirFromSearchPath("../data");
+ delete2(client);
delete2(logger);
// VirtFs::deinit();
}
diff --git a/src/utils/translation/poparser_unittest.cc b/src/utils/translation/poparser_unittest.cc
index 9182bebbc..77d958885 100644
--- a/src/utils/translation/poparser_unittest.cc
+++ b/src/utils/translation/poparser_unittest.cc
@@ -122,9 +122,9 @@ TEST_CASE("PoParser tests", "PoParser")
delete parser;
delete dict;
}
- delete2(client);
VirtFs::removeDirFromSearchPath("data");
VirtFs::removeDirFromSearchPath("../data");
+ delete2(client);
delete2(logger);
// VirtFs::deinit();
}
diff --git a/src/utils/xml_unittest.cc b/src/utils/xml_unittest.cc
index f5211bcb5..3dbda4a1c 100644
--- a/src/utils/xml_unittest.cc
+++ b/src/utils/xml_unittest.cc
@@ -358,10 +358,9 @@ TEST_CASE("xml doc")
::remove(tempXmlName);
}
delete2(theme);
- delete2(client);
VirtFs::removeDirFromSearchPath("data");
VirtFs::removeDirFromSearchPath("../data");
-
+ delete2(client);
delete2(logger);
// VirtFs::deinit();
}
diff --git a/src/utils/xmlutils_unittest.cc b/src/utils/xmlutils_unittest.cc
index dff0b130c..4575854b4 100644
--- a/src/utils/xmlutils_unittest.cc
+++ b/src/utils/xmlutils_unittest.cc
@@ -77,10 +77,10 @@ TEST_CASE("xmlutils readXmlIntVector 1")
REQUIRE(0 == arr[2]);
REQUIRE(1 == arr[3]);
REQUIRE(1 == arr[4]);
- delete2(client);
ResourceManager::deleteInstance();
VirtFs::removeDirFromSearchPath("data");
VirtFs::removeDirFromSearchPath("../data");
+ delete2(client);
delete2(logger);
// VirtFs::deinit();
}
@@ -123,10 +123,10 @@ TEST_CASE("xmlutils readXmlStringMap 1")
REQUIRE(arr["Kitty"] == "0");
REQUIRE(arr["xD"] == "1");
REQUIRE(arr["Metal"] == "26");
- delete2(client);
ResourceManager::deleteInstance();
VirtFs::removeDirFromSearchPath("data");
VirtFs::removeDirFromSearchPath("../data");
+ delete2(client);
delete2(logger);
// VirtFs::deinit();
}
@@ -171,12 +171,12 @@ TEST_CASE("xmlutils readXmlIntMap 1")
REQUIRE(arr[1] == 2);
REQUIRE(arr[10] == 20);
REQUIRE(arr[3] == 0);
- delete2(client);
ResourceManager::deleteInstance();
VirtFs::removeDirFromSearchPath("data/test");
VirtFs::removeDirFromSearchPath("../data/test");
VirtFs::removeDirFromSearchPath("data");
VirtFs::removeDirFromSearchPath("../data");
+ delete2(client);
delete2(logger);
// VirtFs::deinit();
}