diff options
Diffstat (limited to 'src/unittests/fs')
| -rw-r--r-- | src/unittests/fs/files.cc | 207 | ||||
| -rw-r--r-- | src/unittests/fs/virtfs/throw.cc | 225 | ||||
| -rw-r--r-- | src/unittests/fs/virtfs/virtfs.cc | 996 | ||||
| -rw-r--r-- | src/unittests/fs/virtfs/virtfs1_basic.cc | 46 | ||||
| -rw-r--r-- | src/unittests/fs/virtfs/virtfs1_enumerate.cc | 410 | ||||
| -rw-r--r-- | src/unittests/fs/virtfs/virtfs1_exists.cc | 154 | ||||
| -rw-r--r-- | src/unittests/fs/virtfs/virtfs1_getrealdir.cc | 202 | ||||
| -rw-r--r-- | src/unittests/fs/virtfs/virtfs1_mountdir1.cc | 195 | ||||
| -rw-r--r-- | src/unittests/fs/virtfs/virtfs1_mountdir2.cc | 315 | ||||
| -rw-r--r-- | src/unittests/fs/virtfs/virtfs1_mountzip1.cc | 173 | ||||
| -rw-r--r-- | src/unittests/fs/virtfs/virtfs1_mountzip2.cc | 202 | ||||
| -rw-r--r-- | src/unittests/fs/virtfs/virtfs1_unmount.cc | 377 | ||||
| -rw-r--r-- | src/unittests/fs/virtfs/virtfs2.cc | 1643 | ||||
| -rw-r--r-- | src/unittests/fs/virtfs/zip.cc | 283 |
14 files changed, 0 insertions, 5428 deletions
diff --git a/src/unittests/fs/files.cc b/src/unittests/fs/files.cc deleted file mode 100644 index 935a00f72..000000000 --- a/src/unittests/fs/files.cc +++ /dev/null @@ -1,207 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2013-2017 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "unittests/unittests.h" - - -#include "fs/files.h" - -#include "fs/virtfs/fs.h" -#include "fs/virtfs/tools.h" - -#include "utils/stringutils.h" - -#include "resources/resourcemanager/resourcemanager.h" - -#include "debug.h" - -TEST_CASE("Files renameFile", "") -{ - VirtFs::mountDirSilent("data", Append_false); - VirtFs::mountDirSilent("../data", Append_false); - - const int sz = 1234567; - char *buf = new char[sz]; - for (int f = 0; f < sz; f ++) - buf[f] = f; - - const std::string name1 = "file1.test"; - const std::string name2 = "file2.test"; - FILE *file = fopen(name1.c_str(), "w+b"); - fwrite(buf, 1, sz, file); - fclose(file); - - REQUIRE(0 == Files::renameFile(name1, name2)); - char *buf2 = new char[sz]; - FILE *file2 = fopen(name2.c_str(), "rb"); - REQUIRE_FALSE(nullptr == file2); - fread(buf2, 1, sz, file2); - fclose(file2); - ::remove(name1.c_str()); - ::remove(name2.c_str()); - - for (int f = 0; f < sz; f ++) - REQUIRE(buf[f] == buf2[f]); - - delete [] buf; - delete [] buf2; - ResourceManager::deleteInstance(); - VirtFs::unmountDirSilent("data"); - VirtFs::unmountDirSilent("../data"); -} - -TEST_CASE("Files existsLocal", "") -{ - VirtFs::mountDirSilent("data", Append_false); - VirtFs::mountDirSilent("../data", Append_false); - REQUIRE(Files::existsLocal(VirtFs::getPath("help/about.txt")) == true); - REQUIRE_FALSE(Files::existsLocal(VirtFs::getPath("help/about1.txt"))); - REQUIRE_FALSE(Files::existsLocal(VirtFs::getPath("help1/about.txt"))); - ResourceManager::deleteInstance(); - VirtFs::unmountDirSilent("data"); - VirtFs::unmountDirSilent("../data"); -} - -TEST_CASE("Files loadTextFileString", "") -{ - VirtFs::mountDirSilent("data", Append_false); - VirtFs::mountDirSilent("../data", Append_false); - REQUIRE(VirtFs::loadTextFileString("test/simplefile.txt") == - "this is test \nfile."); - ResourceManager::deleteInstance(); - VirtFs::unmountDirSilent("data"); - VirtFs::unmountDirSilent("../data"); -} - -TEST_CASE("Files loadTextFile", "") -{ - VirtFs::mountDirSilent("data", Append_false); - VirtFs::mountDirSilent("../data", Append_false); - - StringVect lines; - VirtFs::loadTextFile("test/simplefile.txt", lines); - REQUIRE(lines.size() == 2); - REQUIRE(lines[0] == "this is test "); - REQUIRE(lines[1] == "file."); - ResourceManager::deleteInstance(); - VirtFs::unmountDirSilent("data"); - VirtFs::unmountDirSilent("../data"); -} - -TEST_CASE("Files saveTextFile", "") -{ - VirtFs::mountDirSilent("data", Append_false); - VirtFs::mountDirSilent("../data", Append_false); - - const std::string dir = VirtFs::getPath("test"); - REQUIRE(!dir.empty()); - Files::saveTextFile(dir, "tempfile.txt", "test line\ntext line2"); - std::string data = VirtFs::loadTextFileString("test/tempfile.txt"); - ::remove((dir + "/tempfile.txt").c_str()); -#ifdef WIN32 - REQUIRE(data == "test line\r\ntext line2\r\n"); -#else // WIN32 - - REQUIRE(data == "test line\ntext line2\n"); -#endif // WIN32 - - ResourceManager::deleteInstance(); - VirtFs::unmountDirSilent("data"); - VirtFs::unmountDirSilent("../data"); -} - -TEST_CASE("Files copyFile1", "") -{ - VirtFs::mountDirSilent("data", Append_false); - VirtFs::mountDirSilent("../data", Append_false); - - const std::string dir = VirtFs::getPath("test"); - REQUIRE(!dir.empty()); - SECTION("copy") - { - REQUIRE(Files::copyFile(pathJoin(dir, "test.txt"), - pathJoin(dir, "tempfile.txt")) == 0); - std::string data = VirtFs::loadTextFileString("test/tempfile.txt"); - ::remove((dir + "/tempfile.txt").c_str()); - REQUIRE(data == "test line 1\ntest line 2"); - } - - SECTION("errors") - { - REQUIRE(Files::copyFile(pathJoin(dir, "test_not_exists.txt"), - pathJoin(dir, "tempfile.txt")) == -1); - REQUIRE(Files::copyFile(pathJoin(dir, "test.txt"), - "/nonexist/root/dir123") == -1); - } - - ResourceManager::deleteInstance(); - VirtFs::unmountDirSilent("data"); - VirtFs::unmountDirSilent("../data"); -} - -TEST_CASE("Files loadTextFileLocal", "") -{ - VirtFs::mountDirSilent("data", Append_false); - VirtFs::mountDirSilent("../data", Append_false); - - const std::string dir = VirtFs::getPath("test"); - REQUIRE(!dir.empty()); - Files::saveTextFile(dir, "tempfile.txt", "test line\ntext line2"); - StringVect lines; - REQUIRE(Files::loadTextFileLocal(pathJoin(dir, "tempfile.txt"), - lines)); - ::remove((dir + "/tempfile.txt").c_str()); - REQUIRE(lines.size() == 2); - REQUIRE(lines[0] == "test line"); - REQUIRE(lines[1] == "text line2"); - - ResourceManager::deleteInstance(); - VirtFs::unmountDirSilent("data"); - VirtFs::unmountDirSilent("../data"); -} - -TEST_CASE("Files getFilesInDir", "") -{ - VirtFs::mountDirSilent("data", Append_false); - VirtFs::mountDirSilent("../data", Append_false); - - StringVect list; - VirtFs::getFilesInDir("test", - list, - ".gpl"); - REQUIRE(list.size() == 1); - REQUIRE(list[0] == pathJoin("test", "palette.gpl")); - - list.clear(); - VirtFs::getFilesInDir("perserver/default", - list, - ".xml"); - REQUIRE(list.size() == 6); - REQUIRE(list[0] == pathJoin("perserver", "default", "charcreation.xml")); - REQUIRE(list[1] == pathJoin("perserver", "default", "deadmessages.xml")); - REQUIRE(list[2] == - pathJoin("perserver", "default", "defaultcommands.xml")); - REQUIRE(list[3] == pathJoin("perserver", "default", "features.xml")); - REQUIRE(list[4] == pathJoin("perserver", "default", "groups.xml")); - REQUIRE(list[5] == pathJoin("perserver", "default", "weapons.xml")); - ResourceManager::deleteInstance(); - VirtFs::unmountDirSilent("data"); - VirtFs::unmountDirSilent("../data"); -} diff --git a/src/unittests/fs/virtfs/throw.cc b/src/unittests/fs/virtfs/throw.cc deleted file mode 100644 index 9f0a18f32..000000000 --- a/src/unittests/fs/virtfs/throw.cc +++ /dev/null @@ -1,225 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2016-2017 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "unittests/unittests.h" - -#include "configmanager.h" -#include "configuration.h" -#include "dirs.h" - -#include "fs/virtfs/fs.h" -#include "fs/virtfs/zipreader.h" - -#include "utils/checkutils.h" - -#ifndef UNITTESTS_CATCH -#include <algorithm> -#endif // UNITTESTS_CATCH - -#include "debug.h" - -TEST_CASE("throw VirtFs1 exists1", "") -{ - VirtFs::init("."); - const bool dir1 = VirtFs::mountDirSilent("data/", - Append_false); - VirtFs::mountDirSilent("..\\data", - Append_false); - - if (dir1 == true) - { - VirtFs::mountDir("data//test", - Append_false); - } - else - { - VirtFs::mountDirSilent("..//data\\test", - Append_false); - } - - if (dir1 == true) - VirtFs::unmountDirSilent("data/test"); - else - VirtFs::unmountDirSilent("../data/test"); - - REQUIRE_THROWS(VirtFs::exists("test/../units.xml")); - - VirtFs::deinit(); -} - -TEST_CASE("throw VirtFs1 exists2", "") -{ - VirtFs::init("."); - const bool dir1 = VirtFs::mountDirSilent2("data/", - "test", - Append_false); - VirtFs::mountDirSilent2("..\\data", - "test", - Append_false); - - if (dir1 == true) - { - VirtFs::mountDir2("data//test", - "dir2", - Append_false); - } - else - { - VirtFs::mountDirSilent2("..//data\\test", - "dir2", - Append_false); - } - - if (dir1 == true) - VirtFs::unmountDirSilent2("data/test", "dir2"); - else - VirtFs::unmountDirSilent2("../data/test", "dir2"); - - REQUIRE_THROWS(VirtFs::exists("test/../units.xml")); - - VirtFs::deinit(); -} - -TEST_CASE("throw Zip readCompressedFile", "") -{ - SECTION("empty") - { - REQUIRE_THROWS(VirtFs::ZipReader::readCompressedFile(nullptr)); - } -} - -TEST_CASE("throw Zip readFile", "") -{ - SECTION("empty") - { - REQUIRE_THROWS(VirtFs::ZipReader::readFile(nullptr)); - } -} - -TEST_CASE("throw VirtFs1 unmount", "") -{ - VirtFs::init("."); - const std::string sep = dirSeparator; - - SECTION("simple 1") - { - REQUIRE_THROWS(VirtFs::unmountDir("dir1")); - REQUIRE_THROWS(VirtFs::unmountDir("dir1/")); - } - - SECTION("simple 2") - { - REQUIRE(VirtFs::mountDirSilentTest("dir1", - Append_true)); - REQUIRE_THROWS(VirtFs::unmountDir("dir2")); - REQUIRE(VirtFs::unmountDir("dir1")); - } - - SECTION("simple 3") - { - REQUIRE(VirtFs::mountDirSilentTest("dir1", - Append_true)); - REQUIRE(VirtFs::mountDirSilentTest("dir2//dir3", - Append_true)); - REQUIRE(VirtFs::mountDirSilentTest("dir3", - Append_false)); - REQUIRE_THROWS(VirtFs::unmountDir("dir2")); - REQUIRE(VirtFs::unmountDir("dir1")); - REQUIRE_THROWS(VirtFs::unmountDir("dir1")); - REQUIRE(VirtFs::unmountDir("dir2/dir3")); - REQUIRE_THROWS(VirtFs::unmountDir("dir2/dir3" + sep)); - } - - SECTION("simple 4") - { - REQUIRE(VirtFs::mountDirSilentTest("dir1", - Append_true)); - REQUIRE_THROWS(VirtFs::unmountDir("dir2")); - REQUIRE(VirtFs::unmountDir("dir1")); - REQUIRE(VirtFs::mountDirSilentTest("dir1", - Append_true)); - } - - SECTION("subDir 1") - { - REQUIRE_THROWS(VirtFs::unmountDir2("dir1", "dir1")); - REQUIRE_THROWS(VirtFs::unmountDir2("dir1/", "dir1/")); - } - - SECTION("subDir 2") - { - REQUIRE(VirtFs::mountDirSilentTest2("dir1", - "dir2", - Append_true)); - REQUIRE_THROWS(VirtFs::unmountDir("dir1")); - REQUIRE_THROWS(VirtFs::unmountDir("dir2")); - REQUIRE(VirtFs::unmountDir2("dir1", "dir2")); - } - - SECTION("subDir 3") - { - REQUIRE(VirtFs::mountDirSilentTest2("dir1", - "dir2", - Append_true)); - REQUIRE(VirtFs::mountDirSilentTest("dir2//dir3", - Append_true)); - REQUIRE(VirtFs::mountDirSilentTest2("dir3", - "dir4", - Append_false)); - REQUIRE_THROWS(VirtFs::unmountDir("dir2")); - REQUIRE_THROWS(VirtFs::unmountDir2("dir1", "dir1")); - REQUIRE(VirtFs::unmountDir2("dir1", "dir2")); - REQUIRE_THROWS(VirtFs::unmountDir("dir1")); - REQUIRE(VirtFs::unmountDir("dir2/dir3")); - REQUIRE_THROWS(VirtFs::unmountDir("dir2/dir3" + sep)); - } - - SECTION("subDir 4") - { - REQUIRE(VirtFs::mountDirSilentTest2("dir1", - "dir2", - Append_true)); - REQUIRE_THROWS(VirtFs::unmountDir("dir2")); - REQUIRE_THROWS(VirtFs::unmountDir("dir1")); - REQUIRE(VirtFs::unmountDir2("dir1", "dir2")); - REQUIRE(VirtFs::mountDirSilentTest2("dir1", - "dir3", - Append_true)); - } - - VirtFs::deinit(); -} - -TEST_CASE("throw configuration tests", "configuration") -{ - Dirs::initRootDir(); - Dirs::initHomeDir(); - - ConfigManager::initConfiguration(); - - SECTION("configuration undefined") - { - const char *const key = "nonsetvalue"; - REQUIRE_THROWS(config.getIntValue(key)); - REQUIRE_THROWS(config.getFloatValue(key)); - REQUIRE_THROWS(config.getStringValue(key)); - REQUIRE_THROWS(config.getBoolValue(key)); - } -} diff --git a/src/unittests/fs/virtfs/virtfs.cc b/src/unittests/fs/virtfs/virtfs.cc deleted file mode 100644 index 64f93c8f4..000000000 --- a/src/unittests/fs/virtfs/virtfs.cc +++ /dev/null @@ -1,996 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2016-2017 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "unittests/unittests.h" - -#include "fs/files.h" -#include "fs/paths.h" - -#include "fs/virtfs/fs.h" -#include "fs/virtfs/list.h" - -#include "utils/checkutils.h" -#include "utils/foreach.h" - -#ifndef UNITTESTS_CATCH -#include <algorithm> -#endif // UNITTESTS_CATCH - -#include "debug.h" - -TEST_CASE("VirtFs dirSeparator", "") -{ - REQUIRE(dirSeparator != nullptr); - REQUIRE(VirtFs::getDirSeparator() == std::string(dirSeparator)); - VirtFs::updateDirSeparator(); - REQUIRE(dirSeparator != nullptr); - REQUIRE(VirtFs::getDirSeparator() == std::string(dirSeparator)); -} - -TEST_CASE("VirtFs getBaseDir", "") -{ - REQUIRE(VirtFs::getBaseDir() != nullptr); -} - -TEST_CASE("VirtFs getUserDir", "") -{ - REQUIRE(VirtFs::getUserDir() != nullptr); -} - -TEST_CASE("VirtFs exists1", "") -{ - VirtFs::mountDirSilent("data", Append_false); - VirtFs::mountDirSilent("../data", Append_false); - - REQUIRE(VirtFs::exists("test") == true); - REQUIRE(VirtFs::exists("test/dir1") == true); - REQUIRE(VirtFs::exists("test/dir") == false); - REQUIRE(VirtFs::exists("test/units.xml") == true); - REQUIRE(VirtFs::exists("test/units123.xml") == false); - REQUIRE(VirtFs::exists("tesQ/units.xml") == false); - REQUIRE(VirtFs::exists("units.xml") == false); - - VirtFs::mountDirSilent("data/test", Append_false); - VirtFs::mountDirSilent("../data/test", Append_false); - - REQUIRE(VirtFs::exists("test") == true); - REQUIRE(VirtFs::exists("test/dir1") == true); - REQUIRE(VirtFs::exists("test/dir") == false); - REQUIRE(VirtFs::exists("test/units.xml") == true); - REQUIRE(VirtFs::exists("test/units123.xml") == false); - REQUIRE(VirtFs::exists("tesQ/units.xml") == false); - REQUIRE(VirtFs::exists("units.xml") == true); - - VirtFs::unmountDirSilent("data/test"); - VirtFs::unmountDirSilent("../data/test"); - - REQUIRE(VirtFs::exists("test") == true); - REQUIRE(VirtFs::exists("test/dir1") == true); - REQUIRE(VirtFs::exists("test/dir") == false); - REQUIRE(VirtFs::exists("test/units.xml") == true); - REQUIRE(VirtFs::exists("test/units123.xml") == false); - REQUIRE(VirtFs::exists("tesQ/units.xml") == false); - REQUIRE(VirtFs::exists("units.xml") == false); - - VirtFs::unmountDirSilent("data"); - VirtFs::unmountDirSilent("../data"); -} - -TEST_CASE("VirtFs exists2", "") -{ - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip(prefix + "data/test/test2.zip", Append_false); - - REQUIRE(VirtFs::exists("test") == false); - REQUIRE(VirtFs::exists("test/units.xml") == false); - REQUIRE(VirtFs::exists("test.txt") == true); - REQUIRE(VirtFs::exists("dir/hide.png") == true); - REQUIRE(VirtFs::exists("dir/gpl") == true); - REQUIRE(VirtFs::exists("dir/gpl/zzz") == false); - REQUIRE(VirtFs::exists("units.xml") == true); - REQUIRE(VirtFs::exists("units.xml.") == false); - REQUIRE(VirtFs::exists("units.xml2") == false); - - VirtFs::unmountZip(prefix + "data/test/test2.zip"); -} - -TEST_CASE("VirtFs exists3", "") -{ - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip(prefix + "data/test/test.zip", Append_false); - VirtFs::mountZip(prefix + "data/test/test2.zip", Append_false); - - REQUIRE(VirtFs::exists("test") == false); - REQUIRE(VirtFs::exists("test/units.xml") == false); - REQUIRE(VirtFs::exists("dir/brimmedhat.png")); - REQUIRE(VirtFs::exists("dir//brimmedhat.png")); - REQUIRE(VirtFs::exists("dir//hide.png")); - REQUIRE(VirtFs::exists("dir/1")); - REQUIRE(VirtFs::exists("dir/gpl")); - REQUIRE(VirtFs::exists("dir/dye.png")); - REQUIRE(VirtFs::exists("dir/2") == false); - REQUIRE(VirtFs::exists("dir2/2") == false); - REQUIRE(VirtFs::exists("dir2/paths.xml")); - - VirtFs::unmountZip(prefix + "data/test/test.zip"); - VirtFs::unmountZip(prefix + "data/test/test2.zip"); -} - -TEST_CASE("VirtFs exists4", "") -{ - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip(prefix + "data/test/test.zip", Append_false); - VirtFs::mountDirSilent(prefix + "data/test", Append_false); - - REQUIRE(VirtFs::exists("test") == false); - REQUIRE(VirtFs::exists("test/units.xml") == false); - REQUIRE(VirtFs::exists("dir/brimmedhat.png")); - REQUIRE(VirtFs::exists("dir//brimmedhat.png")); - REQUIRE(VirtFs::exists("dir//hide.png")); - REQUIRE(VirtFs::exists("dir/1") == false); - REQUIRE(VirtFs::exists("dir/gpl") == false); - REQUIRE(VirtFs::exists("dir/dye.png") == false); - REQUIRE(VirtFs::exists("dir/2") == false); - REQUIRE(VirtFs::exists("dir2/2") == false); - REQUIRE(VirtFs::exists("dir2/paths.xml") == false); - REQUIRE(VirtFs::exists("units.xml")); - REQUIRE(VirtFs::exists("dir1/file1.txt")); - REQUIRE(VirtFs::exists("dir2/file2.txt")); - REQUIRE(VirtFs::exists("dir2/file3.txt") == false); - - VirtFs::unmountZip(prefix + "data/test/test.zip"); - VirtFs::unmountDirSilent(prefix + "data/test"); -} - -TEST_CASE("VirtFs exists5", "") -{ - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - const std::string realDir = getRealPath(prefix + "data"); - logger->log("real dir: " + realDir); - REQUIRE_FALSE(VirtFs::exists(realDir)); -} - -TEST_CASE("VirtFs exists6", "") -{ - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip2(prefix + "data/test/test2.zip", - "dir", - Append_false); - - REQUIRE(VirtFs::exists("test") == false); - REQUIRE(VirtFs::exists("test/units.xml") == false); - REQUIRE(VirtFs::exists("test.txt") == false); - REQUIRE(VirtFs::exists("dir/hide.png") == false); - REQUIRE(VirtFs::exists("dir/gpl") == false); - REQUIRE(VirtFs::exists("dir/gpl/zzz") == false); - REQUIRE(VirtFs::exists("units.xml") == false); - REQUIRE(VirtFs::exists("units.xml.") == false); - REQUIRE(VirtFs::exists("units.xml2") == false); - REQUIRE(VirtFs::exists("hide.png")); - REQUIRE(VirtFs::exists("dye.png")); - REQUIRE(VirtFs::exists("gpl")); - REQUIRE(VirtFs::exists("gpl/zzz") == false); - - VirtFs::unmountZip2(prefix + "data/test/test2.zip", - "dir"); -} - -static void removeTemp(StringVect &restrict list) -{ - int cnt = 0; - std::sort(list.begin(), list.end()); - - FOR_EACH (StringVectIter, it, list) - { - if (*it != "serverlistplus.xml.part") - { - logger->log("file: %d %s", - cnt, - (*it).c_str()); - cnt ++; - } - } - - FOR_EACH (StringVectIter, it, list) - { - if (*it == "serverlistplus.xml.part") - { - list.erase(it); - return; - } - } -} - -static bool inList(const VirtFs::List *const list, - const std::string &name) -{ - FOR_EACH (StringVectCIter, it, list->names) - { - if (*it == name) - return true; - } - return false; -} - -TEST_CASE("VirtFs enumerateFiles1", "") -{ - VirtFs::mountDirSilent("data", Append_false); - VirtFs::mountDirSilent("../data", Append_false); - - VirtFs::List *list = nullptr; - - const int cnt1 = VirtFs::exists("test/test2.txt") ? 28 : 27; - const int cnt2 = 28; - - VirtFs::permitLinks(false); - list = VirtFs::enumerateFiles("test"); - removeTemp(list->names); - const size_t sz = list->names.size(); - REQUIRE(sz == cnt1); - VirtFs::freeList(list); - - VirtFs::permitLinks(true); - list = VirtFs::enumerateFiles("test"); - removeTemp(list->names); - REQUIRE(list->names.size() == cnt2); - VirtFs::freeList(list); - - VirtFs::permitLinks(false); - list = VirtFs::enumerateFiles("test"); - removeTemp(list->names); - REQUIRE(list->names.size() == cnt1); - VirtFs::freeList(list); - - list = VirtFs::enumerateFiles("test/units.xml"); - removeTemp(list->names); - REQUIRE(list->names.empty()); - VirtFs::freeList(list); - - VirtFs::unmountDirSilent("data"); - VirtFs::unmountDirSilent("../data"); -} - -TEST_CASE("VirtFs enumerateFiles2", "") -{ - VirtFs::mountDirSilent("data/test/dir1", - Append_false); - VirtFs::mountDirSilent("../data/test/dir1", - Append_false); - - VirtFs::List *list = nullptr; - - list = VirtFs::enumerateFiles("/"); - REQUIRE(list->names.size() == 5); - VirtFs::freeList(list); - - VirtFs::unmountDirSilent("data/test/dir1"); - VirtFs::unmountDirSilent("../data/test/dir1"); -} - -TEST_CASE("VirtFs enumerateFiles3", "") -{ - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip(prefix + "data/test/test.zip", - Append_false); - - VirtFs::List *list = nullptr; - - list = VirtFs::enumerateFiles("/"); - REQUIRE(list->names.size() == 1); - REQUIRE(inList(list, "dir")); - VirtFs::freeList(list); - - VirtFs::unmountZip(prefix + "data/test/test.zip"); -} - -TEST_CASE("VirtFs enumerateFiles4", "") -{ - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip(prefix + "data/test/test2.zip", - Append_false); - - VirtFs::List *list = nullptr; - - list = VirtFs::enumerateFiles("/"); - REQUIRE(list->names.size() == 4); - REQUIRE(inList(list, "dir")); - REQUIRE(inList(list, "dir2")); - REQUIRE(inList(list, "test.txt")); - REQUIRE(inList(list, "units.xml")); - VirtFs::freeList(list); - - VirtFs::unmountZip(prefix + "data/test/test2.zip"); -} - -TEST_CASE("VirtFs enumerateFiles5", "") -{ - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip(prefix + "data/test/test2.zip", - Append_false); - VirtFs::mountDirSilent(prefix + "data/test", Append_false); - - VirtFs::List *list = nullptr; - - list = VirtFs::enumerateFiles("dir2"); - REQUIRE(inList(list, "file1.txt")); - REQUIRE(inList(list, "file2.txt")); - REQUIRE(inList(list, "hide.png")); - REQUIRE(inList(list, "paths.xml")); - REQUIRE(inList(list, "test.txt")); - REQUIRE(inList(list, "units.xml")); - VirtFs::freeList(list); - - VirtFs::unmountZip(prefix + "data/test/test2.zip"); - VirtFs::unmountDirSilent(prefix + "data/test"); -} - -TEST_CASE("VirtFs isDirectory1", "") -{ - VirtFs::mountDirSilent("data", Append_false); - VirtFs::mountDirSilent("../data", Append_false); - - REQUIRE(VirtFs::isDirectory("test/units.xml") == false); - REQUIRE(VirtFs::isDirectory("test/units.xml/") == false); - REQUIRE(VirtFs::isDirectory("test//units.xml") == false); - REQUIRE(VirtFs::isDirectory("test/units123.xml") == false); - REQUIRE(VirtFs::isDirectory("test//units123.xml") == false); - REQUIRE(VirtFs::isDirectory("tesQ/units.xml") == false); - REQUIRE(VirtFs::isDirectory("tesQ//units.xml") == false); - REQUIRE(VirtFs::isDirectory("units.xml") == false); - REQUIRE(VirtFs::isDirectory("test") == true); - REQUIRE(VirtFs::isDirectory("test/") == true); - REQUIRE(VirtFs::isDirectory("test//") == true); - REQUIRE(VirtFs::isDirectory("test/dir1") == true); - REQUIRE(VirtFs::isDirectory("test//dir1") == true); - REQUIRE(VirtFs::isDirectory("test//dir1/") == true); - REQUIRE(VirtFs::isDirectory("test//dir1//") == true); - REQUIRE(VirtFs::isDirectory("test/dir1/") == true); - REQUIRE(VirtFs::isDirectory("test/dir1//") == true); - REQUIRE(VirtFs::isDirectory("testQ") == false); - REQUIRE(VirtFs::isDirectory("testQ/") == false); - REQUIRE(VirtFs::isDirectory("testQ//") == false); - - VirtFs::mountDirSilent("data/test", Append_false); - VirtFs::mountDirSilent("../data/test", Append_false); - - REQUIRE(VirtFs::isDirectory("test/units.xml") == false); - REQUIRE(VirtFs::isDirectory("test/units.xml/") == false); - REQUIRE(VirtFs::isDirectory("test//units.xml") == false); - REQUIRE(VirtFs::isDirectory("test/units123.xml") == false); - REQUIRE(VirtFs::isDirectory("tesQ/units.xml") == false); - REQUIRE(VirtFs::isDirectory("units.xml") == false); - REQUIRE(VirtFs::isDirectory("test") == true); - REQUIRE(VirtFs::isDirectory("testQ") == false); - REQUIRE(VirtFs::isDirectory("test/dir1") == true); - - VirtFs::unmountDirSilent("data/test"); - VirtFs::unmountDirSilent("../data/test"); - - REQUIRE(VirtFs::isDirectory("test/units.xml") == false); - REQUIRE(VirtFs::isDirectory("test/units123.xml") == false); - REQUIRE(VirtFs::isDirectory("tesQ/units.xml") == false); - REQUIRE(VirtFs::isDirectory("units.xml") == false); - REQUIRE(VirtFs::isDirectory("units.xml/") == false); - REQUIRE(VirtFs::isDirectory("test") == true); - REQUIRE(VirtFs::isDirectory("test/") == true); - REQUIRE(VirtFs::isDirectory("testQ") == false); - REQUIRE(VirtFs::isDirectory("test/dir1") == true); - - VirtFs::unmountDirSilent("data"); - VirtFs::unmountDirSilent("../data"); -} - -TEST_CASE("VirtFs isDirectory2", "") -{ - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip(prefix + "data/test/test2.zip", Append_false); - - REQUIRE(VirtFs::isDirectory("test/units.xml") == false); - REQUIRE(VirtFs::isDirectory("dir") == true); - REQUIRE(VirtFs::isDirectory("dir/") == true); - REQUIRE(VirtFs::isDirectory("dir//") == true); - REQUIRE(VirtFs::isDirectory("dir2") == true); - REQUIRE(VirtFs::isDirectory("dir3") == false); - REQUIRE(VirtFs::isDirectory("test.txt") == false); - - VirtFs::unmountZip(prefix + "data/test/test2.zip"); -} - -TEST_CASE("VirtFs isDirectory3", "") -{ - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountDir(prefix + "data", Append_false); - VirtFs::mountZip(prefix + "data/test/test2.zip", Append_false); - - REQUIRE(VirtFs::isDirectory("test/units.xml") == false); - REQUIRE(VirtFs::isDirectory("test")); - REQUIRE(VirtFs::isDirectory("test//dye.png") == false); - REQUIRE(VirtFs::isDirectory("dir")); - REQUIRE(VirtFs::isDirectory("dir/")); - REQUIRE(VirtFs::isDirectory("dir//")); - REQUIRE(VirtFs::isDirectory("dir2")); - REQUIRE(VirtFs::isDirectory("dir3") == false); - REQUIRE(VirtFs::isDirectory("test.txt") == false); - REQUIRE(VirtFs::isDirectory("dir/hide.png") == false); - - VirtFs::unmountZip(prefix + "data/test/test2.zip"); - VirtFs::unmountDir(prefix + "data"); -} - -TEST_CASE("VirtFs openRead1", "") -{ - VirtFs::mountDirSilent("data", Append_false); - VirtFs::mountDirSilent("../data", Append_false); - - VirtFs::File *file = nullptr; - - file = VirtFs::openRead("test/units.xml"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("test/units123.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("tesQ/units.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("units.xml"); - REQUIRE(file == nullptr); -// file = VirtFs::openRead("test"); -// REQUIRE(file == nullptr); - file = VirtFs::openRead("testQ"); - REQUIRE(file == nullptr); - - VirtFs::mountDirSilent("data/test", Append_false); - VirtFs::mountDirSilent("../data/test", Append_false); - - file = VirtFs::openRead("test/units.xml"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("test/units123.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("tesQ/units.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("units.xml"); - REQUIRE(file != nullptr); - VirtFs::close(file); -// file = VirtFs::openRead("test"); -// REQUIRE(file == nullptr); - file = VirtFs::openRead("testQ"); - REQUIRE(file == nullptr); - - VirtFs::unmountDirSilent("data/test"); - VirtFs::unmountDirSilent("../data/test"); - - file = VirtFs::openRead("test/units.xml"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("test/units123.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("tesQ/units.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("units.xml"); - REQUIRE(file == nullptr); -// file = VirtFs::openRead("test"); -// REQUIRE(file == nullptr); - file = VirtFs::openRead("testQ"); - REQUIRE(file == nullptr); - - VirtFs::unmountDirSilent("data"); - VirtFs::unmountDirSilent("../data"); -} - -TEST_CASE("VirtFs openRead2", "") -{ - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip(prefix + "data/test/test2.zip", Append_false); - - VirtFs::File *file = nullptr; - - file = VirtFs::openRead("test/units.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("units.xml"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("dir/hide.png"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("dir//hide.png"); - REQUIRE(file != nullptr); - VirtFs::close(file); - - VirtFs::unmountZip(prefix + "data/test/test2.zip"); -} - -TEST_CASE("VirtFs openRead3", "") -{ - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip(prefix + "data/test/test2.zip", Append_false); - VirtFs::mountDir(prefix + "data/test", Append_false); - - VirtFs::File *file = nullptr; - - file = VirtFs::openRead("test/units.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("units.xml"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("dir/hide.png"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("dir//hide.png"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("dir/dye.png"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("dir/dye.pn_"); - REQUIRE(file == nullptr); - - VirtFs::unmountZip(prefix + "data/test/test2.zip"); - VirtFs::unmountDir(prefix + "data/test"); -} - -TEST_CASE("VirtFs getRealDir1", "") -{ - const std::string sep = dirSeparator; - REQUIRE(VirtFs::getRealDir(".").empty()); - REQUIRE(VirtFs::getRealDir("..").empty()); - const bool dir1 = VirtFs::mountDirSilent("data", Append_false); - REQUIRE((dir1 || VirtFs::mountDirSilent("../data", Append_false)) - == true); - if (dir1 == true) - { - REQUIRE(VirtFs::getRealDir("test") == "data"); - REQUIRE(VirtFs::getRealDir("test/test.txt") == - "data"); - } - else - { - REQUIRE(VirtFs::getRealDir("test") == "../data"); - REQUIRE(VirtFs::getRealDir("test/test.txt") == - "../data"); - } - REQUIRE(VirtFs::getRealDir("zzz").empty()); - - VirtFs::mountDirSilent("data/test", Append_false); - VirtFs::mountDirSilent("../data/test", Append_false); - if (dir1 == true) - { - REQUIRE(VirtFs::getRealDir("test") == "data"); - REQUIRE(VirtFs::getRealDir("test/test.txt") == - "data"); - REQUIRE(VirtFs::getRealDir("test.txt") == - "data" + sep + "test"); - } - else - { - REQUIRE(VirtFs::getRealDir("test") == ".." + sep + "data"); - REQUIRE(VirtFs::getRealDir("test/test.txt") == - ".." + sep + "data"); - REQUIRE(VirtFs::getRealDir("test.txt") == - ".." + sep + "data" + sep + "test"); - } - REQUIRE(VirtFs::getRealDir("zzz").empty()); - - if (dir1 == true) - { - VirtFs::mountZip("data/test/test.zip", Append_false); - REQUIRE(VirtFs::getRealDir("dir/brimmedhat.png") == - "data" + sep + "test" + sep + "test.zip"); - REQUIRE(VirtFs::getRealDir("hide.png") == - "data" + sep + "test"); - } - else - { - VirtFs::mountZip("../data/test/test.zip", Append_false); - REQUIRE(VirtFs::getRealDir("dir/brimmedhat.png") == - ".." + sep + "data" + sep + "test" + sep + "test.zip"); - REQUIRE(VirtFs::getRealDir("hide.png") == - ".." + sep + "data" + sep + "test"); - } - - VirtFs::unmountDirSilent("data/test"); - VirtFs::unmountDirSilent("../data/test"); - - if (dir1 == true) - { - REQUIRE(VirtFs::getRealDir("test") == "data"); - REQUIRE(VirtFs::getRealDir("test/test.txt") == - "data"); - REQUIRE(VirtFs::getRealDir("dir/hide.png") == - "data" + sep + "test" + sep + "test.zip"); - } - else - { - REQUIRE(VirtFs::getRealDir("test") == ".." + sep + "data"); - REQUIRE(VirtFs::getRealDir("test/test.txt") == - ".." + sep + "data"); - REQUIRE(VirtFs::getRealDir("dir/hide.png") == - ".." + sep + "data" + sep + "test" + sep + "test.zip"); - } - REQUIRE(VirtFs::exists("dir/hide.png")); - REQUIRE(VirtFs::getRealDir("zzz").empty()); - - VirtFs::unmountDirSilent("data"); - VirtFs::unmountDirSilent("../data"); - if (dir1 == true) - VirtFs::unmountZip("data/test/test.zip"); - else - VirtFs::unmountZip("../data/test/test.zip"); -} - -TEST_CASE("VirtFs getrealDir2", "") -{ - const std::string sep = dirSeparator; - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip(prefix + "data/test/test2.zip", Append_false); - VirtFs::mountDir(prefix + "data/test", Append_false); - VirtFs::mountDir(prefix + "data", Append_false); - - REQUIRE(VirtFs::getRealDir("zzz").empty()); - - REQUIRE(VirtFs::getRealDir("dir1/file1.txt") == - prefix + "data" + sep + "test"); - REQUIRE(VirtFs::getRealDir("hide.png") == - prefix + "data" + sep + "test"); - REQUIRE(VirtFs::getRealDir("dir//hide.png") == - prefix + "data" + sep + "test" + sep + "test2.zip"); - REQUIRE(VirtFs::getRealDir("dir/1//test.txt") == - prefix + "data" + sep + "test" + sep + "test2.zip"); - - VirtFs::unmountZip(prefix + "data/test/test2.zip"); - VirtFs::unmountDir(prefix + "data/test"); - VirtFs::unmountDir(prefix + "data"); -} - -TEST_CASE("VirtFs getrealDir3", "") -{ - const std::string sep = dirSeparator; - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip2(prefix + "data/test/test2.zip", - "dir", - Append_false); - VirtFs::mountDir(prefix + "data/test", Append_false); - - REQUIRE(VirtFs::getRealDir("zzz").empty()); - - REQUIRE(VirtFs::getRealDir("dir1/file1.txt") == - prefix + "data" + sep + "test"); - REQUIRE(VirtFs::getRealDir("hide.png") == - prefix + "data" + sep + "test"); - REQUIRE(VirtFs::getRealDir("hide.png") == - prefix + "data" + sep + "test"); - REQUIRE(VirtFs::getRealDir("1//test.txt") == - prefix + "data" + sep + "test" + sep + "test2.zip"); - - VirtFs::unmountZip2(prefix + "data/test/test2.zip", - "dir"); - VirtFs::unmountDir(prefix + "data/test"); -} - -TEST_CASE("VirtFs permitLinks1", "") -{ - VirtFs::mountDirSilent("data", Append_false); - VirtFs::mountDirSilent("../data", Append_false); - - const int cnt1 = VirtFs::exists("test/test2.txt") ? 26 : 25; - const int cnt2 = 26; - - StringVect list; - VirtFs::permitLinks(false); - VirtFs::getFiles("test", list); - removeTemp(list); - const size_t sz = list.size(); - REQUIRE(sz == cnt1); - - list.clear(); - VirtFs::permitLinks(true); - VirtFs::getFiles("test", list); - removeTemp(list); - REQUIRE(list.size() == cnt2); - - list.clear(); - VirtFs::permitLinks(false); - VirtFs::getFiles("test", list); - removeTemp(list); - REQUIRE(list.size() == cnt1); - - VirtFs::unmountDirSilent("data"); - VirtFs::unmountDirSilent("../data"); -} - -TEST_CASE("VirtFs permitLinks2", "") -{ - VirtFs::mountDirSilent2("data", - "test", - Append_false); - VirtFs::mountDirSilent2("../data", - "test", - Append_false); - - const int cnt1 = VirtFs::exists("test2.txt") ? 26 : 25; - const int cnt2 = 26; - - StringVect list; - VirtFs::permitLinks(false); - VirtFs::getFiles(dirSeparator, list); - removeTemp(list); - const size_t sz = list.size(); - REQUIRE(sz == cnt1); - - list.clear(); - VirtFs::permitLinks(true); - VirtFs::getFiles(dirSeparator, list); - removeTemp(list); - REQUIRE(list.size() == cnt2); - - list.clear(); - VirtFs::permitLinks(false); - VirtFs::getFiles(dirSeparator, list); - removeTemp(list); - REQUIRE(list.size() == cnt1); - - VirtFs::unmountDirSilent2("data", - "test"); - VirtFs::unmountDirSilent2("../data", - "test"); -} - -TEST_CASE("VirtFs read1", "") -{ - VirtFs::mountDirSilent("data", Append_false); - VirtFs::mountDirSilent("../data", Append_false); - - VirtFs::File *file = VirtFs::openRead("test/test.txt"); - REQUIRE(file != nullptr); - REQUIRE(VirtFs::fileLength(file) == 23); - const int fileSize = VirtFs::fileLength(file); - - void *restrict buffer = calloc(fileSize + 1, 1); - REQUIRE(VirtFs::read(file, buffer, 1, fileSize) == fileSize); - REQUIRE(strcmp(static_cast<char*>(buffer), - "test line 1\ntest line 2") == 0); - REQUIRE(VirtFs::tell(file) == fileSize); - REQUIRE(VirtFs::eof(file) == true); - - free(buffer); - buffer = calloc(fileSize + 1, 1); - REQUIRE(VirtFs::seek(file, 12) != 0); - REQUIRE(VirtFs::eof(file) == false); - REQUIRE(VirtFs::tell(file) == 12); - REQUIRE(VirtFs::read(file, buffer, 1, 11) == 11); - REQUIRE(strcmp(static_cast<char*>(buffer), - "test line 2") == 0); - REQUIRE(VirtFs::eof(file) == true); - - VirtFs::close(file); - free(buffer); - - VirtFs::unmountDirSilent("data"); - VirtFs::unmountDirSilent("../data"); -} - -TEST_CASE("VirtFs read2", "") -{ - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip(prefix + "data/test/test2.zip", Append_false); - - VirtFs::File *file = VirtFs::openRead("dir2/test.txt"); - REQUIRE(file != nullptr); - REQUIRE(VirtFs::fileLength(file) == 23); - const int fileSize = VirtFs::fileLength(file); - - void *restrict buffer = calloc(fileSize + 1, 1); - REQUIRE(VirtFs::read(file, buffer, 1, fileSize) == fileSize); - REQUIRE(strcmp(static_cast<char*>(buffer), - "test line 1\ntest line 2") == 0); - REQUIRE(VirtFs::tell(file) == fileSize); - REQUIRE(VirtFs::eof(file) == true); - - free(buffer); - buffer = calloc(fileSize + 1, 1); - REQUIRE(VirtFs::seek(file, 12) != 0); - REQUIRE(VirtFs::eof(file) == false); - REQUIRE(VirtFs::tell(file) == 12); - REQUIRE(VirtFs::read(file, buffer, 1, 11) == 11); - REQUIRE(strcmp(static_cast<char*>(buffer), - "test line 2") == 0); - REQUIRE(VirtFs::eof(file) == true); - - VirtFs::close(file); - free(buffer); - - VirtFs::unmountZip(prefix + "data/test/test2.zip"); -} - -TEST_CASE("VirtFs read3", "") -{ - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip(prefix + "data/test/test2.zip", Append_false); - VirtFs::mountDir(prefix + "data", Append_false); - - VirtFs::File *file = VirtFs::openRead("dir2/test.txt"); - REQUIRE(file != nullptr); - REQUIRE(VirtFs::fileLength(file) == 23); - const int fileSize = VirtFs::fileLength(file); - - void *restrict buffer = calloc(fileSize + 1, 1); - REQUIRE(VirtFs::read(file, buffer, 1, fileSize) == fileSize); - REQUIRE(strcmp(static_cast<char*>(buffer), - "test line 1\ntest line 2") == 0); - REQUIRE(VirtFs::tell(file) == fileSize); - REQUIRE(VirtFs::eof(file) == true); - - free(buffer); - buffer = calloc(fileSize + 1, 1); - REQUIRE(VirtFs::seek(file, 12) != 0); - REQUIRE(VirtFs::eof(file) == false); - REQUIRE(VirtFs::tell(file) == 12); - REQUIRE(VirtFs::read(file, buffer, 1, 11) == 11); - REQUIRE(strcmp(static_cast<char*>(buffer), - "test line 2") == 0); - REQUIRE(VirtFs::eof(file) == true); - - VirtFs::close(file); - free(buffer); - - VirtFs::unmountZip(prefix + "data/test/test2.zip"); - VirtFs::unmountDir(prefix + "data"); -} - -TEST_CASE("VirtFs read4", "") -{ - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountDir(prefix + "data/test", Append_true); - VirtFs::mountZip(prefix + "data/test/test5.zip", Append_true); - - VirtFs::File *file = VirtFs::openRead("dir1/file1.txt"); - REQUIRE(file != nullptr); - REQUIRE(VirtFs::fileLength(file) == 23); - const int fileSize = VirtFs::fileLength(file); - - void *restrict buffer = calloc(fileSize + 1, 1); - REQUIRE(VirtFs::read(file, buffer, 1, fileSize) == fileSize); - REQUIRE(strcmp(static_cast<char*>(buffer), - "test line 1\ntest line 2") == 0); - REQUIRE(VirtFs::tell(file) == fileSize); - REQUIRE(VirtFs::eof(file) == true); - - free(buffer); - buffer = calloc(fileSize + 1, 1); - REQUIRE(VirtFs::seek(file, 12) != 0); - REQUIRE(VirtFs::eof(file) == false); - REQUIRE(VirtFs::tell(file) == 12); - REQUIRE(VirtFs::read(file, buffer, 1, 11) == 11); - REQUIRE(strcmp(static_cast<char*>(buffer), - "test line 2") == 0); - REQUIRE(VirtFs::eof(file) == true); - - VirtFs::close(file); - free(buffer); - - VirtFs::unmountZip(prefix + "data/test/test5.zip"); - VirtFs::unmountDir(prefix + "data/test"); -} - -TEST_CASE("VirtFs read5", "") -{ - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip(prefix + "data/test/test5.zip", Append_true); - VirtFs::mountDir(prefix + "data/test", Append_true); - - VirtFs::File *file = VirtFs::openRead("dir1/file1.txt"); - REQUIRE(file != nullptr); - REQUIRE(VirtFs::fileLength(file) == 23); - const int fileSize = VirtFs::fileLength(file); - - void *restrict buffer = calloc(fileSize + 1, 1); - REQUIRE(VirtFs::read(file, buffer, 1, fileSize) == fileSize); - REQUIRE(strcmp(static_cast<char*>(buffer), - "test line 3\ntest line 4") == 0); - REQUIRE(VirtFs::tell(file) == fileSize); - REQUIRE(VirtFs::eof(file) == true); - - free(buffer); - buffer = calloc(fileSize + 1, 1); - REQUIRE(VirtFs::seek(file, 12) != 0); - REQUIRE(VirtFs::eof(file) == false); - REQUIRE(VirtFs::tell(file) == 12); - REQUIRE(VirtFs::read(file, buffer, 1, 11) == 11); - REQUIRE(strcmp(static_cast<char*>(buffer), - "test line 4") == 0); - REQUIRE(VirtFs::eof(file) == true); - - VirtFs::close(file); - free(buffer); - - VirtFs::unmountZip(prefix + "data/test/test5.zip"); - VirtFs::unmountDir(prefix + "data/test"); -} diff --git a/src/unittests/fs/virtfs/virtfs1_basic.cc b/src/unittests/fs/virtfs/virtfs1_basic.cc deleted file mode 100644 index 73153df37..000000000 --- a/src/unittests/fs/virtfs/virtfs1_basic.cc +++ /dev/null @@ -1,46 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2016-2017 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "unittests/unittests.h" - -#include "fs/virtfs/fs.h" - -#include "utils/checkutils.h" - -#ifndef UNITTESTS_CATCH -#include <algorithm> -#endif // UNITTESTS_CATCH - -#include "debug.h" - -TEST_CASE("VirtFs1 getEntries", "") -{ - VirtFs::init("."); - REQUIRE(VirtFs::getEntries().empty()); - REQUIRE(VirtFs::searchByRootInternal("test", std::string()) == nullptr); - VirtFs::deinit(); -} - -TEST_CASE("VirtFs1 getBaseDir", "") -{ - VirtFs::init("."); - REQUIRE(VirtFs::getBaseDir() != nullptr); - VirtFs::deinit(); -} diff --git a/src/unittests/fs/virtfs/virtfs1_enumerate.cc b/src/unittests/fs/virtfs/virtfs1_enumerate.cc deleted file mode 100644 index 4eb79e673..000000000 --- a/src/unittests/fs/virtfs/virtfs1_enumerate.cc +++ /dev/null @@ -1,410 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2016-2017 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "unittests/unittests.h" - -#include "fs/files.h" - -#include "fs/virtfs/fs.h" -#include "fs/virtfs/list.h" - -#include "utils/checkutils.h" -#include "utils/foreach.h" - -#ifndef UNITTESTS_CATCH -#include <algorithm> -#endif // UNITTESTS_CATCH - -#include "debug.h" - -static void removeTemp(StringVect &restrict list) -{ - int cnt = 0; - std::sort(list.begin(), list.end()); - - FOR_EACH (StringVectIter, it, list) - { - if (*it != "serverlistplus.xml.part") - { - logger->log("file: %d %s", - cnt, - (*it).c_str()); - cnt ++; - } - } - - FOR_EACH (StringVectIter, it, list) - { - if (*it == "serverlistplus.xml.part") - { - list.erase(it); - return; - } - } -} - -static bool inList(const VirtFs::List *const list, - const std::string &name) -{ - FOR_EACH (StringVectCIter, it, list->names) - { - if (*it == name) - return true; - } - return false; -} - -TEST_CASE("VirtFs1 enumerateFiles1", "") -{ - VirtFs::init("."); - - VirtFs::mountDirSilent("data", - Append_false); - VirtFs::mountDirSilent("../data", - Append_false); - - VirtFs::List *list = nullptr; - - const int cnt1 = VirtFs::exists("test/test2.txt") ? 28 : 27; - const int cnt2 = 28; - - VirtFs::permitLinks(false); - list = VirtFs::enumerateFiles("test"); - removeTemp(list->names); - const size_t sz = list->names.size(); - REQUIRE(sz == cnt1); - VirtFs::freeList(list); - - VirtFs::permitLinks(true); - list = VirtFs::enumerateFiles("test/"); - removeTemp(list->names); - REQUIRE(list->names.size() == cnt2); - VirtFs::freeList(list); - - VirtFs::permitLinks(true); - list = VirtFs::enumerateFiles("test/units.xml"); - REQUIRE(list->names.empty()); - VirtFs::freeList(list); - - VirtFs::permitLinks(false); - list = VirtFs::enumerateFiles("test\\"); - removeTemp(list->names); - REQUIRE(list->names.size() == cnt1); - VirtFs::freeList(list); - - VirtFs::unmountDirSilent("data"); - VirtFs::unmountDirSilent("../data"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFs1 enumerateFiles2", "") -{ - VirtFs::init("."); - - VirtFs::mountDirSilent("data/test/dir1", - Append_false); - VirtFs::mountDirSilent("../data/test/dir1", - Append_false); - - VirtFs::List *list = nullptr; - - list = VirtFs::enumerateFiles("/"); - REQUIRE(list->names.size() == 5); - REQUIRE(inList(list, "file1.txt")); - REQUIRE_FALSE(inList(list, "file2.txt")); - VirtFs::freeList(list); - VirtFs::deinit(); -} - -TEST_CASE("VirtFs1 enumerateFiles3", "") -{ - VirtFs::init("."); - - VirtFs::mountDirSilent("data/test/dir1", - Append_false); - VirtFs::mountDirSilent("../data/test/dir1", - Append_false); - VirtFs::mountDirSilent("data/test/dir2", - Append_false); - VirtFs::mountDirSilent("../data/test/dir2", - Append_false); - - VirtFs::List *list = nullptr; - - list = VirtFs::enumerateFiles("/"); - REQUIRE(inList(list, "file1.txt")); - REQUIRE(inList(list, "file2.txt")); - VirtFs::freeList(list); - VirtFs::deinit(); -} - -TEST_CASE("VirtFsZip enumerateFiles4", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix("data\\test/"); - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip(prefix + "test.zip", - Append_false); - - VirtFs::List *list = nullptr; - - list = VirtFs::enumerateFiles("dir"); - REQUIRE(list->names.size() == 2); - REQUIRE(inList(list, "brimmedhat.png")); - REQUIRE(inList(list, "hide.png")); - VirtFs::freeList(list); - - VirtFs::unmountZip(prefix + "test.zip"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFsZip enumerateFiles5", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix("data//test/"); - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip(prefix + "test.zip", - Append_true); - VirtFs::mountZip(prefix + "test2.zip", - Append_true); - - VirtFs::List *list = nullptr; - - list = VirtFs::enumerateFiles("dir"); - FOR_EACH (StringVectCIter, it, list->names) - { - logger->log("filename: " + *it); - } - - REQUIRE(list->names.size() == 5); - REQUIRE(inList(list, "brimmedhat.png")); - REQUIRE(inList(list, "hide.png")); - REQUIRE(inList(list, "1")); - REQUIRE(inList(list, "gpl")); - REQUIRE(inList(list, "dye.png")); - VirtFs::freeList(list); - - VirtFs::unmountZip(prefix + "test.zip"); - VirtFs::unmountZip(prefix + "test2.zip"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFsZip enumerateFiles6", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix("data\\test/"); - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip(prefix + "test.zip", - Append_false); - - VirtFs::List *list = nullptr; - - list = VirtFs::enumerateFiles("/"); - REQUIRE(list->names.size() == 1); - REQUIRE(inList(list, "dir")); - VirtFs::freeList(list); - - VirtFs::unmountZip(prefix + "test.zip"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFsZip enumerateFiles7", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix("data\\test/"); - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip(prefix + "test2.zip", - Append_false); - - VirtFs::List *list = nullptr; - - list = VirtFs::enumerateFiles("/"); - REQUIRE(list->names.size() == 4); - REQUIRE(inList(list, "dir")); - REQUIRE(inList(list, "dir2")); - REQUIRE(inList(list, "test.txt")); - REQUIRE(inList(list, "units.xml")); - VirtFs::freeList(list); - - VirtFs::unmountZip(prefix + "test2.zip"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFsZip enumerateFiles8", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip(prefix + "data/test/test2.zip", - Append_false); - VirtFs::mountDirSilent(prefix + "data/test", - Append_false); - - VirtFs::List *list = nullptr; - - list = VirtFs::enumerateFiles("dir2"); - REQUIRE(list->names.size() >= 6); - REQUIRE(inList(list, "file1.txt")); - REQUIRE(inList(list, "file2.txt")); - REQUIRE(inList(list, "hide.png")); - REQUIRE(inList(list, "paths.xml")); - REQUIRE(inList(list, "test.txt")); - REQUIRE(inList(list, "units.xml")); - VirtFs::freeList(list); - - VirtFs::unmountZip(prefix + "data/test/test2.zip"); - VirtFs::unmountDir(prefix + "data/test"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFsZip enumerateFiles9", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip(prefix + "data/test/test2.zip", - Append_false); - VirtFs::mountDirSilent(prefix + "data/test", - Append_false); - - VirtFs::List *list = nullptr; - - list = VirtFs::enumerateFiles("dir"); - REQUIRE(list->names.size() == 4); - REQUIRE(inList(list, "1")); - REQUIRE(inList(list, "gpl")); - REQUIRE(inList(list, "dye.png")); - REQUIRE(inList(list, "hide.png")); - VirtFs::freeList(list); - - VirtFs::unmountZip(prefix + "data/test/test2.zip"); - VirtFs::unmountDir(prefix + "data/test"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFsZip enumerateFiles10", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix("data\\test/"); - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip2(prefix + "test.zip", - "dir", - Append_false); - - VirtFs::List *list = nullptr; - - list = VirtFs::enumerateFiles("/"); - REQUIRE(list->names.size() == 2); - REQUIRE(inList(list, "brimmedhat.png")); - REQUIRE(inList(list, "hide.png")); - VirtFs::freeList(list); - - VirtFs::unmountZip2(prefix + "test.zip", - "dir"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFsZip enumerateFiles11", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix("data\\test/"); - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip2(prefix + "test2.zip", - "dir", - Append_false); - - VirtFs::List *list = nullptr; - - list = VirtFs::enumerateFiles("1"); - REQUIRE(list->names.size() == 2); - REQUIRE(inList(list, "file1.txt")); - REQUIRE(inList(list, "test.txt")); - VirtFs::freeList(list); - - VirtFs::unmountZip2(prefix + "test2.zip", - "dir"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFs1 enumerateFiles12", "") -{ - VirtFs::init("."); - - VirtFs::mountDirSilent2("data/test", - "dir2", - Append_false); - VirtFs::mountDirSilent2("../data/test", - "dir2", - Append_false); - - VirtFs::List *list = nullptr; - - list = VirtFs::enumerateFiles("/"); - REQUIRE(inList(list, "file1.txt")); - REQUIRE(inList(list, "file2.txt")); - VirtFs::freeList(list); - - VirtFs::deinit(); -} - -TEST_CASE("VirtFs1 enumerateFiles13", "") -{ - VirtFs::init("."); - - VirtFs::mountDirSilent2("data", - "test", - Append_false); - VirtFs::mountDirSilent2("../data", - "test", - Append_false); - - VirtFs::List *list = nullptr; - - list = VirtFs::enumerateFiles("dir2"); - REQUIRE(inList(list, "file1.txt")); - REQUIRE(inList(list, "file2.txt")); - VirtFs::freeList(list); - - VirtFs::deinit(); -} diff --git a/src/unittests/fs/virtfs/virtfs1_exists.cc b/src/unittests/fs/virtfs/virtfs1_exists.cc deleted file mode 100644 index 24f3e19f2..000000000 --- a/src/unittests/fs/virtfs/virtfs1_exists.cc +++ /dev/null @@ -1,154 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2016-2017 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "unittests/unittests.h" - -#include "fs/virtfs/fs.h" - -#include "utils/checkutils.h" - -#ifndef UNITTESTS_CATCH -#include <algorithm> -#endif // UNITTESTS_CATCH - -#include "debug.h" - -TEST_CASE("VirtFs1 exists1", "") -{ - VirtFs::init("."); - const bool dir1 = VirtFs::mountDirSilent("data/", - Append_false); - VirtFs::mountDirSilent("..\\data", - Append_false); - - REQUIRE(VirtFs::exists("test")); - REQUIRE(VirtFs::exists("test/")); - REQUIRE(VirtFs::exists("test/dir1")); - REQUIRE(VirtFs::exists("test/dir1/")); - REQUIRE(VirtFs::exists("test/dir") == false); - REQUIRE(VirtFs::exists("test//units.xml") == true); - REQUIRE(VirtFs::exists("test/\\units123.xml") == false); - REQUIRE(VirtFs::exists("tesQ/units.xml") == false); - REQUIRE(VirtFs::exists("units.xml") == false); - - if (dir1 == true) - { - VirtFs::mountDir("data//test", - Append_false); - } - else - { - VirtFs::mountDirSilent("..//data\\test", - Append_false); - } - - REQUIRE(VirtFs::exists("test") == true); - REQUIRE(VirtFs::exists("test/dir1")); - REQUIRE(VirtFs::exists("test/dir1\\")); - REQUIRE(VirtFs::exists("test/dir") == false); - REQUIRE(VirtFs::exists("test\\units.xml") == true); - REQUIRE(VirtFs::exists("test/units123.xml") == false); - REQUIRE(VirtFs::exists("tesQ/units.xml") == false); - REQUIRE(VirtFs::exists("units.xml") == true); - REQUIRE(VirtFs::exists("units.xml/") == false); - - if (dir1 == true) - VirtFs::unmountDirSilent("data/test"); - else - VirtFs::unmountDirSilent("../data/test"); - - REQUIRE(VirtFs::exists("test") == true); - REQUIRE(VirtFs::exists("test/dir1")); - REQUIRE(VirtFs::exists("test/dir") == false); - REQUIRE(VirtFs::exists("test\\units.xml") == true); - REQUIRE(VirtFs::exists("test/units123.xml") == false); - REQUIRE(VirtFs::exists("tesQ/units.xml") == false); - REQUIRE(VirtFs::exists("units.xml") == false); - REQUIRE(VirtFs::exists("units.xml/") == false); - - VirtFs::deinit(); -} - -TEST_CASE("VirtFs1 exists2", "") -{ - VirtFs::init("."); - const bool dir1 = VirtFs::mountDirSilent2("data/", - "test", - Append_false); - VirtFs::mountDirSilent2("..\\data", - "test", - Append_false); - - REQUIRE(VirtFs::exists("test") == false); - REQUIRE(VirtFs::exists("test/") == false); - REQUIRE(VirtFs::exists("dir1")); - REQUIRE(VirtFs::exists("dir1/")); - REQUIRE(VirtFs::exists("dir") == false); - REQUIRE(VirtFs::exists("units.xml") == true); - REQUIRE(VirtFs::exists("units123.xml") == false); - REQUIRE(VirtFs::exists("tesQ/units.xml") == false); - REQUIRE(VirtFs::exists("units.xml")); - REQUIRE(VirtFs::exists("file1.txt") == false); - REQUIRE(VirtFs::exists("file2.txt") == false); - - if (dir1 == true) - { - VirtFs::mountDir2("data//test", - "dir2", - Append_false); - } - else - { - VirtFs::mountDirSilent2("..//data\\test", - "dir2", - Append_false); - } - - REQUIRE(VirtFs::exists("test") == false); - REQUIRE(VirtFs::exists("test/") == false); - REQUIRE(VirtFs::exists("dir1")); - REQUIRE(VirtFs::exists("dir1/")); - REQUIRE(VirtFs::exists("dir") == false); - REQUIRE(VirtFs::exists("units.xml") == true); - REQUIRE(VirtFs::exists("units123.xml") == false); - REQUIRE(VirtFs::exists("tesQ/units.xml") == false); - REQUIRE(VirtFs::exists("units.xml")); - REQUIRE(VirtFs::exists("file1.txt")); - REQUIRE(VirtFs::exists("file2.txt")); - - if (dir1 == true) - VirtFs::unmountDirSilent2("data/test", "dir2"); - else - VirtFs::unmountDirSilent2("../data/test", "dir2"); - - REQUIRE(VirtFs::exists("test") == false); - REQUIRE(VirtFs::exists("test/") == false); - REQUIRE(VirtFs::exists("dir1")); - REQUIRE(VirtFs::exists("dir1/")); - REQUIRE(VirtFs::exists("dir") == false); - REQUIRE(VirtFs::exists("units.xml") == true); - REQUIRE(VirtFs::exists("units123.xml") == false); - REQUIRE(VirtFs::exists("tesQ/units.xml") == false); - REQUIRE(VirtFs::exists("units.xml")); - REQUIRE(VirtFs::exists("file1.txt") == false); - REQUIRE(VirtFs::exists("file2.txt") == false); - - VirtFs::deinit(); -} diff --git a/src/unittests/fs/virtfs/virtfs1_getrealdir.cc b/src/unittests/fs/virtfs/virtfs1_getrealdir.cc deleted file mode 100644 index ca58a993e..000000000 --- a/src/unittests/fs/virtfs/virtfs1_getrealdir.cc +++ /dev/null @@ -1,202 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2016-2017 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "unittests/unittests.h" - -#include "fs/files.h" - -#include "fs/virtfs/fs.h" - -#include "utils/checkutils.h" - -#ifndef UNITTESTS_CATCH -#include <algorithm> -#endif // UNITTESTS_CATCH - -#include "debug.h" - -TEST_CASE("VirtFs1 getRealDir1", "") -{ - VirtFs::init("."); - const std::string sep = dirSeparator; - REQUIRE(VirtFs::getRealDir(".").empty()); - REQUIRE(VirtFs::getRealDir("..").empty()); - const bool dir1 = VirtFs::mountDirSilent("data", - Append_false); - REQUIRE((dir1 || VirtFs::mountDirSilent("../data", - Append_false)) == true); - if (dir1 == true) - { - REQUIRE(VirtFs::getRealDir("test") == "data"); - REQUIRE(VirtFs::getRealDir("test/test.txt") == - "data"); - REQUIRE(VirtFs::getRealDir("test\\test.txt") == - "data"); - REQUIRE(VirtFs::getRealDir("test//test.txt") == - "data"); - } - else - { - REQUIRE(VirtFs::getRealDir("test") == "../data"); - REQUIRE(VirtFs::getRealDir("test/test.txt") == - "../data"); - REQUIRE(VirtFs::getRealDir("test\\test.txt") == - "../data"); - REQUIRE(VirtFs::getRealDir("test//test.txt") == - "../data"); - } - REQUIRE(VirtFs::getRealDir("zzz").empty()); - - VirtFs::mountDirSilent("data/test", - Append_false); - VirtFs::mountDirSilent("../data/test", - Append_false); - if (dir1 == true) - { - REQUIRE(VirtFs::getRealDir("test") == "data"); - REQUIRE(VirtFs::getRealDir("test/test.txt") == - "data"); - REQUIRE(VirtFs::getRealDir("test\\test.txt") == - "data"); - REQUIRE(VirtFs::getRealDir("test.txt") == - "data" + sep + "test"); - } - else - { - REQUIRE(VirtFs::getRealDir("test") == ".." + sep + "data"); - REQUIRE(VirtFs::getRealDir("test/test.txt") == - ".." + sep + "data"); - REQUIRE(VirtFs::getRealDir("test\\test.txt") == - ".." + sep + "data"); - REQUIRE(VirtFs::getRealDir("test.txt") == - ".." + sep + "data" + sep + "test"); - } - REQUIRE(VirtFs::getRealDir("zzz").empty()); - - VirtFs::unmountDirSilent("data/test"); - VirtFs::unmountDirSilent("../data/test"); - - if (dir1 == true) - { - REQUIRE(VirtFs::getRealDir("test") == "data"); - REQUIRE(VirtFs::getRealDir("test/test.txt") == - "data"); - } - else - { - REQUIRE(VirtFs::getRealDir("test") == ".." + sep + "data"); - REQUIRE(VirtFs::getRealDir("test/test.txt") == - ".." + sep + "data"); - } - REQUIRE(VirtFs::getRealDir("zzz").empty()); - - VirtFs::unmountDirSilent("data"); - VirtFs::unmountDirSilent("../data"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFs1 getRealDir2", "") -{ - VirtFs::init("."); - const std::string sep = dirSeparator; - std::string name("data/test/test.zip"); - std::string prefix("data" + sep + "test" + sep); - if (Files::existsLocal(name) == false) - prefix = ".." + sep + prefix; - VirtFs::mountZip(prefix + "test2.zip", - Append_false); - - REQUIRE(VirtFs::getRealDir(".").empty()); - REQUIRE(VirtFs::getRealDir("..").empty()); - REQUIRE(VirtFs::getRealDir("test.txt") == prefix + "test2.zip"); - REQUIRE(VirtFs::getRealDir("dir/1") == prefix + "test2.zip"); - REQUIRE(VirtFs::getRealDir("dir\\dye.png") == - prefix + "test2.zip"); - REQUIRE(VirtFs::getRealDir("zzz").empty()); - - VirtFs::mountZip(prefix + "test.zip", - Append_false); - REQUIRE(VirtFs::getRealDir("dir//dye.png") == - prefix + "test2.zip"); - REQUIRE(VirtFs::getRealDir("dir///hide.png") == - prefix + "test.zip"); - REQUIRE(VirtFs::getRealDir("dir\\\\brimmedhat.png") == - prefix + "test.zip"); - REQUIRE(VirtFs::getRealDir("zzz").empty()); - - VirtFs::unmountZip(prefix + "test.zip"); - - REQUIRE(VirtFs::getRealDir("dir/brimmedhat.png").empty()); - REQUIRE(VirtFs::getRealDir("test.txt") == prefix + "test2.zip"); - REQUIRE(VirtFs::getRealDir("dir//dye.png") == - prefix + "test2.zip"); - REQUIRE(VirtFs::getRealDir("zzz").empty()); - - VirtFs::unmountZip(prefix + "test2.zip"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFs1 getRealDir3", "") -{ - VirtFs::init("."); - const std::string sep = dirSeparator; - REQUIRE(VirtFs::getRealDir(".").empty()); - REQUIRE(VirtFs::getRealDir("..").empty()); - const bool dir1 = VirtFs::mountDirSilent2("data", - "test", - Append_false); - REQUIRE((dir1 || VirtFs::mountDirSilent2("../data", - "test", - Append_false)) == true); - REQUIRE(VirtFs::getRealDir("file1.txt").empty()); - if (dir1 == true) - { - REQUIRE(VirtFs::getRealDir("dir1") == "data"); - REQUIRE(VirtFs::getRealDir("simplefile.txt") == "data"); - } - else - { - REQUIRE(VirtFs::getRealDir("dir1") == ".." + sep + "data"); - REQUIRE(VirtFs::getRealDir("simplefile.txt") == ".." + sep + "data"); - } - REQUIRE(VirtFs::getRealDir("zzz").empty()); - - VirtFs::mountDirSilent2("data/test", - "dir2", - Append_false); - VirtFs::mountDirSilent2("../data/test", - "dir2", - Append_false); - REQUIRE(VirtFs::getRealDir("dir").empty()); - if (dir1 == true) - { - REQUIRE(VirtFs::getRealDir("file1.txt") == "data" + sep + "test"); - REQUIRE(VirtFs::getRealDir("simplefile.txt") == "data"); - } - else - { - REQUIRE(VirtFs::getRealDir("file1.txt") == - ".." + sep + "data" + sep + "test"); - REQUIRE(VirtFs::getRealDir("simplefile.txt") == ".." + sep + "data"); - } - REQUIRE(VirtFs::getRealDir("zzz").empty()); - - VirtFs::deinit(); -} diff --git a/src/unittests/fs/virtfs/virtfs1_mountdir1.cc b/src/unittests/fs/virtfs/virtfs1_mountdir1.cc deleted file mode 100644 index 92d6d037d..000000000 --- a/src/unittests/fs/virtfs/virtfs1_mountdir1.cc +++ /dev/null @@ -1,195 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2016-2017 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "unittests/unittests.h" - -#include "fs/virtfs/direntry.h" -#include "fs/virtfs/fs.h" - -#include "utils/checkutils.h" - -#ifndef UNITTESTS_CATCH -#include <algorithm> -#endif // UNITTESTS_CATCH - -#include "debug.h" - -TEST_CASE("VirtFs1 mountDir1", "") -{ - VirtFs::init("."); - const std::string sep = dirSeparator; - SECTION("simple 1") - { - REQUIRE(VirtFs::mountDirSilentTest("dir1", - Append_false)); - REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, std::string()) != - nullptr); - REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir1") == - nullptr); - REQUIRE(VirtFs::searchByRootInternal("test" + sep, std::string()) == - nullptr); - REQUIRE(VirtFs::getEntries().size() == 1); - REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[0]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[0])->userDir == "dir1"); - } - - SECTION("simple 2") - { - REQUIRE(VirtFs::mountDirSilentTest("dir1/", - Append_true)); - REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, std::string()) != - nullptr); - REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir1") == - nullptr); - REQUIRE(VirtFs::searchByRootInternal("test" + sep, std::string()) == - nullptr); - REQUIRE(VirtFs::getEntries().size() == 1); - REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[0]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[0])->userDir == "dir1" + sep); - } - - SECTION("simple 3") - { - REQUIRE(VirtFs::mountDirSilentTest("dir1", - Append_false)); - REQUIRE(VirtFs::mountDirSilentTest("dir2", - Append_false)); - REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, std::string()) != - nullptr); - REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir1") == - nullptr); - REQUIRE(VirtFs::searchByRootInternal("dir2" + sep, std::string()) != - nullptr); - REQUIRE(VirtFs::searchByRootInternal("test" + sep, std::string()) == - nullptr); - REQUIRE(VirtFs::getEntries().size() == 2); - REQUIRE(VirtFs::getEntries()[0]->root == "dir2" + sep); - REQUIRE(VirtFs::getEntries()[1]->root == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir); - REQUIRE(VirtFs::getEntries()[0]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[1]->subDir.empty()); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[0])->userDir == "dir2"); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[1])->userDir == "dir1"); - } - - SECTION("simple 4") - { - REQUIRE(VirtFs::mountDirSilentTest("dir1\\", - Append_true)); - REQUIRE(VirtFs::mountDirSilentTest("dir2", - Append_true)); - REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, std::string()) != - nullptr); - REQUIRE(VirtFs::searchByRootInternal("dir2" + sep, std::string()) != - nullptr); - REQUIRE(VirtFs::searchByRootInternal("test" + sep, std::string()) == - nullptr); - REQUIRE(VirtFs::getEntries().size() == 2); - REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[1]->root == "dir2" + sep); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir); - REQUIRE(VirtFs::getEntries()[0]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[1]->subDir.empty()); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[0])->userDir == "dir1" + sep); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[1])->userDir == "dir2"); - } - - SECTION("simple 5") - { - REQUIRE(VirtFs::mountDirSilentTest("dir1", - Append_true)); - REQUIRE(VirtFs::mountDirSilentTest("dir2", - Append_true)); - REQUIRE(VirtFs::mountDirSilentTest("dir3/test", - Append_true)); - REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, std::string()) != - nullptr); - REQUIRE(VirtFs::searchByRootInternal("dir2" + sep, std::string()) != - nullptr); - REQUIRE(VirtFs::searchByRootInternal( - "dir3" + sep + "test" + sep, std::string()) != nullptr); - REQUIRE(VirtFs::searchByRootInternal("test" + sep, std::string()) == - nullptr); - REQUIRE(VirtFs::getEntries().size() == 3); - REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[1]->root == "dir2" + sep); - REQUIRE(VirtFs::getEntries()[2]->root == "dir3" + sep + "test" + sep); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir); - REQUIRE(VirtFs::getEntries()[2]->type == FsEntryType::Dir); - REQUIRE(VirtFs::getEntries()[0]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[1]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[2]->subDir.empty()); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[0])->userDir == "dir1"); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[1])->userDir == "dir2"); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[2])->userDir == "dir3" + sep + "test"); - } - - SECTION("simple 6") - { - REQUIRE(VirtFs::mountDirSilentTest("dir1", - Append_true)); - REQUIRE(VirtFs::mountDirSilentTest("dir2", - Append_true)); - REQUIRE(VirtFs::mountDirSilentTest("dir3\\test", - Append_false)); - REQUIRE(VirtFs::searchByRootInternal( - "dir1" + sep + "", std::string()) != nullptr); - REQUIRE(VirtFs::searchByRootInternal( - "dir2" + sep + "", std::string()) != nullptr); - REQUIRE(VirtFs::searchByRootInternal( - "dir3" + sep + "test" + sep, std::string()) != nullptr); - REQUIRE(VirtFs::searchByRootInternal( - "test" + sep + "", std::string()) == nullptr); - REQUIRE(VirtFs::getEntries().size() == 3); - REQUIRE(VirtFs::getEntries()[0]->root == "dir3" + sep + "test" + sep); - REQUIRE(VirtFs::getEntries()[1]->root == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[2]->root == "dir2" + sep); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir); - REQUIRE(VirtFs::getEntries()[2]->type == FsEntryType::Dir); - REQUIRE(VirtFs::getEntries()[0]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[1]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[2]->subDir.empty()); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[0])->userDir == "dir3" + sep + "test"); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[1])->userDir == "dir1"); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[2])->userDir == "dir2"); - } - - VirtFs::deinit(); -} diff --git a/src/unittests/fs/virtfs/virtfs1_mountdir2.cc b/src/unittests/fs/virtfs/virtfs1_mountdir2.cc deleted file mode 100644 index 35900389f..000000000 --- a/src/unittests/fs/virtfs/virtfs1_mountdir2.cc +++ /dev/null @@ -1,315 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2016-2017 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "unittests/unittests.h" - -#include "fs/virtfs/direntry.h" -#include "fs/virtfs/fs.h" - -#include "utils/checkutils.h" - -#ifndef UNITTESTS_CATCH -#include <algorithm> -#endif // UNITTESTS_CATCH - -#include "debug.h" - -TEST_CASE("VirtFs1 mountDir2", "") -{ - VirtFs::init("."); - const std::string sep = dirSeparator; - SECTION("subDir 1") - { - REQUIRE(VirtFs::mountDirSilentTest2("dir1", - dirSeparator, - Append_false)); - REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, std::string()) != - nullptr); - REQUIRE(VirtFs::searchByRootInternal("test" + sep, std::string()) == - nullptr); - REQUIRE(VirtFs::getEntries().size() == 1); - REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[0]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[0])->userDir == "dir1"); - } - - SECTION("subDir 1.2") - { - REQUIRE(VirtFs::mountDirSilentTest2("dir1", - "dir2", - Append_false)); - REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir2" + sep) != - nullptr); - REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir1" + sep) == - nullptr); - REQUIRE(VirtFs::searchByRootInternal("test" + sep, "dir2" + sep) == - nullptr); - REQUIRE(VirtFs::getEntries().size() == 1); - REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[0]->subDir == "dir2" + sep); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[0])->userDir == "dir1"); - } - - SECTION("subDir 2") - { - REQUIRE(VirtFs::mountDirSilentTest2("dir1/", - "dir2", - Append_true)); - REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir2" + sep) != - nullptr); - REQUIRE(VirtFs::searchByRootInternal("test" + sep, "dir2" + sep) == - nullptr); - REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir1" + sep) == - nullptr); - REQUIRE(VirtFs::getEntries().size() == 1); - REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[0]->subDir == "dir2" + sep); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[0])->userDir == "dir1" + sep); - } - - SECTION("subDir 3") - { - REQUIRE(VirtFs::mountDirSilentTest2("dir1", - "dir3", - Append_false)); - REQUIRE(VirtFs::mountDirSilentTest2("dir2", - "dir4", - Append_false)); - REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir3" + sep) != - nullptr); - REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir1" + sep) == - nullptr); - REQUIRE(VirtFs::searchByRootInternal("dir2" + sep, "dir4" + sep) != - nullptr); - REQUIRE(VirtFs::searchByRootInternal("test" + sep, "dir3" + sep) == - nullptr); - REQUIRE(VirtFs::getEntries().size() == 2); - REQUIRE(VirtFs::getEntries()[0]->root == "dir2" + sep); - REQUIRE(VirtFs::getEntries()[1]->root == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir); - REQUIRE(VirtFs::getEntries()[0]->subDir == "dir4" + sep); - REQUIRE(VirtFs::getEntries()[1]->subDir == "dir3" + sep); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[0])->userDir == "dir2"); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[1])->userDir == "dir1"); - } - - SECTION("subDir 4") - { - REQUIRE(VirtFs::mountDirSilentTest2("dir1\\", - "dir3", - Append_true)); - REQUIRE(VirtFs::mountDirSilentTest2("dir2", - "dir4", - Append_true)); - REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir3" + sep) != - nullptr); - REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir1" + sep) == - nullptr); - REQUIRE(VirtFs::searchByRootInternal("dir2" + sep, "dir4" + sep) != - nullptr); - REQUIRE(VirtFs::searchByRootInternal("test" + sep, "dir3" + sep) == - nullptr); - REQUIRE(VirtFs::getEntries().size() == 2); - REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[1]->root == "dir2" + sep); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir); - REQUIRE(VirtFs::getEntries()[0]->subDir == "dir3" + sep); - REQUIRE(VirtFs::getEntries()[1]->subDir == "dir4" + sep); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[0])->userDir == "dir1" + sep); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[1])->userDir == "dir2"); - } - - SECTION("subDir 5") - { - REQUIRE(VirtFs::mountDirSilentTest2("dir1", - "dir3", - Append_true)); - REQUIRE(VirtFs::mountDirSilentTest2("dir2", - "dir4", - Append_true)); - REQUIRE(VirtFs::mountDirSilentTest2("dir3/test", - "dir5", - Append_true)); - REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir3" + sep) != - nullptr); - REQUIRE(VirtFs::searchByRootInternal("dir2" + sep, "dir4" + sep) != - nullptr); - REQUIRE(VirtFs::searchByRootInternal( - "dir3" + sep + "test" + sep, "dir5" + sep) != nullptr); - REQUIRE(VirtFs::searchByRootInternal("test" + sep, "dir3" + sep) == - nullptr); - REQUIRE(VirtFs::getEntries().size() == 3); - REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[1]->root == "dir2" + sep); - REQUIRE(VirtFs::getEntries()[2]->root == "dir3" + sep + "test" + sep); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir); - REQUIRE(VirtFs::getEntries()[2]->type == FsEntryType::Dir); - REQUIRE(VirtFs::getEntries()[0]->subDir == "dir3" + sep); - REQUIRE(VirtFs::getEntries()[1]->subDir == "dir4" + sep); - REQUIRE(VirtFs::getEntries()[2]->subDir == "dir5" + sep); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[0])->userDir == "dir1"); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[1])->userDir == "dir2"); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[2])->userDir == "dir3" + sep + "test"); - } - - SECTION("subDir 6") - { - REQUIRE(VirtFs::mountDirSilentTest2("dir1", - "dir1", - Append_true)); - REQUIRE(VirtFs::mountDirSilentTest2("dir2", - "dir2", - Append_true)); - REQUIRE(VirtFs::mountDirSilentTest2("dir3\\test", - "dir3\\test", - Append_false)); - REQUIRE(VirtFs::searchByRootInternal( - "dir1" + sep + "", "dir1" + sep) != nullptr); - REQUIRE(VirtFs::searchByRootInternal( - "dir2" + sep + "", "dir2" + sep) != nullptr); - REQUIRE(VirtFs::searchByRootInternal( - "dir3" + sep + "test" + sep, - "dir3" + sep + "test" + sep) != nullptr); - REQUIRE(VirtFs::searchByRootInternal( - "test" + sep + "", "dir1" + sep) == nullptr); - REQUIRE(VirtFs::getEntries().size() == 3); - REQUIRE(VirtFs::getEntries()[0]->root == "dir3" + sep + "test" + sep); - REQUIRE(VirtFs::getEntries()[1]->root == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[2]->root == "dir2" + sep); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir); - REQUIRE(VirtFs::getEntries()[2]->type == FsEntryType::Dir); - REQUIRE(VirtFs::getEntries()[0]->subDir == - "dir3" + sep + "test" + sep); - REQUIRE(VirtFs::getEntries()[1]->subDir == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[2]->subDir == "dir2" + sep); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[0])->userDir == "dir3" + sep + "test"); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[1])->userDir == "dir1"); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[2])->userDir == "dir2"); - } - - SECTION("subDir 7") - { - REQUIRE(VirtFs::mountDirSilentTest("dir1", - Append_true)); - REQUIRE(VirtFs::mountDirSilentTest2("dir1", - "dir2", - Append_true)); - REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, std::string()) != - nullptr); - REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir2" + sep) != - nullptr); - REQUIRE(VirtFs::searchByRootInternal("test" + sep, "dir2" + sep) == - nullptr); - REQUIRE(VirtFs::getEntries().size() == 2); - REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[0]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(VirtFs::getEntries()[1]->root == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[1]->subDir == "dir2" + sep); - REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[0])->userDir == "dir1"); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[1])->userDir == "dir1"); - - REQUIRE(VirtFs::unmountDirSilent("dir1")); - REQUIRE(VirtFs::getEntries().size() == 1); - REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[0]->subDir == "dir2" + sep); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[0])->userDir == "dir1"); - } - - SECTION("subDir 8") - { - REQUIRE(VirtFs::mountDirSilentTest("dir1", - Append_true)); - REQUIRE(VirtFs::mountDirSilentTest2("dir1", - "dir2", - Append_true)); - REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, std::string()) != - nullptr); - REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir2" + sep) != - nullptr); - REQUIRE(VirtFs::searchByRootInternal("test" + sep, "dir2" + sep) == - nullptr); - REQUIRE(VirtFs::getEntries().size() == 2); - REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[0]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(VirtFs::getEntries()[1]->root == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[1]->subDir == "dir2" + sep); - REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[0])->userDir == "dir1"); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[1])->userDir == "dir1"); - - REQUIRE(VirtFs::unmountDirSilent2("dir1", "dir2")); - REQUIRE(VirtFs::getEntries().size() == 1); - REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[0]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[0])->userDir == "dir1"); - } - - SECTION("subDir 9") - { - REQUIRE(VirtFs::mountDirSilentTest2("dir1", - dirSeparator, - Append_false)); - REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, std::string()) != - nullptr); - REQUIRE(VirtFs::searchByRootInternal("dir1" + sep, "dir1") == - nullptr); - REQUIRE(VirtFs::searchByRootInternal("test" + sep, std::string()) == - nullptr); - REQUIRE(VirtFs::getEntries().size() == 1); - REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[0]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[0])->userDir == "dir1"); - } - - VirtFs::deinit(); -} diff --git a/src/unittests/fs/virtfs/virtfs1_mountzip1.cc b/src/unittests/fs/virtfs/virtfs1_mountzip1.cc deleted file mode 100644 index 09932f0a6..000000000 --- a/src/unittests/fs/virtfs/virtfs1_mountzip1.cc +++ /dev/null @@ -1,173 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2016-2017 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "unittests/unittests.h" - -#include "fs/files.h" - -#include "fs/virtfs/direntry.h" -#include "fs/virtfs/fs.h" - -#include "utils/checkutils.h" - -#ifndef UNITTESTS_CATCH -#include <algorithm> -#endif // UNITTESTS_CATCH - -#include "debug.h" - -TEST_CASE("VirtFs1 mountZip1", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix; - const std::string sep = dirSeparator; - if (Files::existsLocal(name) == false) - prefix = "../"; - - SECTION("simple 1") - { - REQUIRE(VirtFs::mountZip(prefix + "data/test/test.zip", - Append_false)); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test.zip", std::string()) != - nullptr); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test2.zip", - std::string()) == nullptr); - REQUIRE(VirtFs::getEntries().size() == 1); - REQUIRE(VirtFs::getEntries()[0]->root == - prefix + "data" + sep + "test" + sep + "test.zip"); - REQUIRE(VirtFs::getEntries()[0]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip); - } - - SECTION("simple 2") - { - REQUIRE(VirtFs::mountZip(prefix + "data/test/test.zip", - Append_false)); - REQUIRE(VirtFs::mountZip(prefix + "data/test/test2.zip", - Append_false)); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test.zip", - std::string()) != nullptr); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test2.zip", - std::string()) != nullptr); - REQUIRE(VirtFs::getEntries().size() == 2); - REQUIRE(VirtFs::getEntries()[0]->root == - prefix + "data" + sep + "test" + sep + "test2.zip"); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip); - REQUIRE(VirtFs::getEntries()[0]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[1]->root == - prefix + "data" + sep + "test" + sep + "test.zip"); - REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Zip); - REQUIRE(VirtFs::getEntries()[1]->subDir.empty()); - } - - SECTION("simple 3") - { - REQUIRE(VirtFs::mountZip(prefix + "data/test/test.zip", - Append_true)); - REQUIRE(VirtFs::mountZip(prefix + "data/test/test2.zip", - Append_true)); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test.zip", - std::string()) != nullptr); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test2.zip", - std::string()) != nullptr); - REQUIRE(VirtFs::getEntries().size() == 2); - REQUIRE(VirtFs::getEntries()[0]->root == - prefix + "data" + sep + "test" + sep + "test.zip"); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip); - REQUIRE(VirtFs::getEntries()[0]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[1]->root == - prefix + "data" + sep + "test" + sep + "test2.zip"); - REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Zip); - REQUIRE(VirtFs::getEntries()[1]->subDir.empty()); - } - - SECTION("simple 4") - { - REQUIRE(VirtFs::mountZip(prefix + "data/test/test.zip", - Append_false)); - REQUIRE(VirtFs::mountDir(prefix + "data/test", - Append_false)); - REQUIRE(VirtFs::mountZip(prefix + "data/test/test2.zip", - Append_false)); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test.zip", - std::string()) != nullptr); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test2.zip", - std::string()) != nullptr); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "", - std::string()) != nullptr); - REQUIRE(VirtFs::getEntries().size() == 3); - REQUIRE(VirtFs::getEntries()[0]->root == - prefix + "data" + sep + "test" + sep + "test2.zip"); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip); - REQUIRE(VirtFs::getEntries()[0]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[1]->root == - prefix + "data" + sep + "test" + sep + ""); - REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir); - REQUIRE(VirtFs::getEntries()[1]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[2]->root == - prefix + "data" + sep + "test" + sep + "test.zip"); - REQUIRE(VirtFs::getEntries()[2]->type == FsEntryType::Zip); - REQUIRE(VirtFs::getEntries()[2]->subDir.empty()); - } - - SECTION("simple 5") - { - REQUIRE(VirtFs::mountZip(prefix + "data/test/test.zip", - Append_false)); - REQUIRE(VirtFs::mountDir(prefix + "data/test", - Append_false)); - REQUIRE(VirtFs::mountZip(prefix + "data/test/test2.zip", - Append_true)); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test.zip", - std::string()) != nullptr); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test2.zip", - std::string()) != nullptr); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "", - std::string()) != nullptr); - REQUIRE(VirtFs::getEntries().size() == 3); - REQUIRE(VirtFs::getEntries()[0]->root == - prefix + "data" + sep + "test" + sep + ""); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(VirtFs::getEntries()[0]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[1]->root == - prefix + "data" + sep + "test" + sep + "test.zip"); - REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Zip); - REQUIRE(VirtFs::getEntries()[1]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[2]->root == - prefix + "data" + sep + "test" + sep + "test2.zip"); - REQUIRE(VirtFs::getEntries()[2]->type == FsEntryType::Zip); - REQUIRE(VirtFs::getEntries()[2]->subDir.empty()); - } - - VirtFs::deinit(); -} diff --git a/src/unittests/fs/virtfs/virtfs1_mountzip2.cc b/src/unittests/fs/virtfs/virtfs1_mountzip2.cc deleted file mode 100644 index c9415e007..000000000 --- a/src/unittests/fs/virtfs/virtfs1_mountzip2.cc +++ /dev/null @@ -1,202 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2016-2017 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "unittests/unittests.h" - -#include "fs/files.h" - -#include "fs/virtfs/direntry.h" -#include "fs/virtfs/fs.h" - -#include "utils/checkutils.h" - -#ifndef UNITTESTS_CATCH -#include <algorithm> -#endif // UNITTESTS_CATCH - -#include "debug.h" - -TEST_CASE("VirtFs1 mountZip2", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix; - const std::string sep = dirSeparator; - if (Files::existsLocal(name) == false) - prefix = "../"; - - SECTION("subDir 1") - { - REQUIRE(VirtFs::mountZip2(prefix + "data/test/test.zip", - "dir1", - Append_false)); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test.zip", "dir1" + sep) != - nullptr); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test2.zip", - std::string()) == nullptr); - REQUIRE(VirtFs::getEntries().size() == 1); - REQUIRE(VirtFs::getEntries()[0]->root == - prefix + "data" + sep + "test" + sep + "test.zip"); - REQUIRE(VirtFs::getEntries()[0]->subDir == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip); - } - - SECTION("subDir 2") - { - REQUIRE(VirtFs::mountZip2(prefix + "data/test/test.zip", - "dir1", - Append_false)); - REQUIRE(VirtFs::mountZip2(prefix + "data/test/test2.zip", - "dir2", - Append_false)); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test.zip", "dir1" + sep) != - nullptr); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test2.zip", - "dir2" + sep) != nullptr); - REQUIRE(VirtFs::getEntries().size() == 2); - REQUIRE(VirtFs::getEntries()[0]->root == - prefix + "data" + sep + "test" + sep + "test2.zip"); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip); - REQUIRE(VirtFs::getEntries()[0]->subDir == "dir2" + sep); - REQUIRE(VirtFs::getEntries()[1]->root == - prefix + "data" + sep + "test" + sep + "test.zip"); - REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Zip); - REQUIRE(VirtFs::getEntries()[1]->subDir == "dir1" + sep); - } - - SECTION("subDir 3") - { - REQUIRE(VirtFs::mountZip2(prefix + "data/test/test.zip", - "dir1", - Append_true)); - REQUIRE(VirtFs::mountZip2(prefix + "data/test/test2.zip", - "dir2", - Append_true)); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test.zip", - "dir1" + sep) != nullptr); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test2.zip", - "dir2" + sep) != nullptr); - REQUIRE(VirtFs::getEntries().size() == 2); - REQUIRE(VirtFs::getEntries()[0]->root == - prefix + "data" + sep + "test" + sep + "test.zip"); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip); - REQUIRE(VirtFs::getEntries()[0]->subDir == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[1]->root == - prefix + "data" + sep + "test" + sep + "test2.zip"); - REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Zip); - REQUIRE(VirtFs::getEntries()[1]->subDir == "dir2" + sep); - } - - SECTION("subDir 4") - { - REQUIRE(VirtFs::mountZip2(prefix + "data/test/test.zip", - "dir1", - Append_false)); - REQUIRE(VirtFs::mountDir2(prefix + "data/test", - "dir2", - Append_false)); - REQUIRE(VirtFs::mountZip2(prefix + "data/test/test2.zip", - "dir3", - Append_false)); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test.zip", - "dir1" + sep) != nullptr); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test2.zip", - "dir3" + sep) != nullptr); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "", - "dir2" + sep) != nullptr); - REQUIRE(VirtFs::getEntries().size() == 3); - REQUIRE(VirtFs::getEntries()[0]->root == - prefix + "data" + sep + "test" + sep + "test2.zip"); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip); - REQUIRE(VirtFs::getEntries()[0]->subDir == "dir3" + sep); - REQUIRE(VirtFs::getEntries()[1]->root == - prefix + "data" + sep + "test" + sep + ""); - REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir); - REQUIRE(VirtFs::getEntries()[1]->subDir == "dir2" + sep); - REQUIRE(VirtFs::getEntries()[2]->root == - prefix + "data" + sep + "test" + sep + "test.zip"); - REQUIRE(VirtFs::getEntries()[2]->type == FsEntryType::Zip); - REQUIRE(VirtFs::getEntries()[2]->subDir == "dir1" + sep); - } - - SECTION("subDir 5") - { - REQUIRE(VirtFs::mountZip2(prefix + "data/test/test.zip", - "dir1", - Append_false)); - REQUIRE(VirtFs::mountDir2(prefix + "data/test", - "dir2", - Append_false)); - REQUIRE(VirtFs::mountZip2(prefix + "data/test/test2.zip", - "dir3", - Append_true)); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test.zip", - "dir1" + sep) != nullptr); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test2.zip", - "dir3" + sep) != nullptr); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "", - "dir2" + sep) != nullptr); - REQUIRE(VirtFs::getEntries().size() == 3); - REQUIRE(VirtFs::getEntries()[0]->root == - prefix + "data" + sep + "test" + sep + ""); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(VirtFs::getEntries()[0]->subDir == "dir2" + sep); - REQUIRE(VirtFs::getEntries()[1]->root == - prefix + "data" + sep + "test" + sep + "test.zip"); - REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Zip); - REQUIRE(VirtFs::getEntries()[1]->subDir == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[2]->root == - prefix + "data" + sep + "test" + sep + "test2.zip"); - REQUIRE(VirtFs::getEntries()[2]->type == FsEntryType::Zip); - REQUIRE(VirtFs::getEntries()[2]->subDir == "dir3" + sep); - } - - SECTION("subDir 6") - { - REQUIRE(VirtFs::mountZip2(prefix + "data/test/test.zip", - dirSeparator, - Append_false)); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test.zip", - std::string()) != nullptr); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test2.zip", - std::string()) == nullptr); - REQUIRE(VirtFs::getEntries().size() == 1); - REQUIRE(VirtFs::getEntries()[0]->root == - prefix + "data" + sep + "test" + sep + "test.zip"); - REQUIRE(VirtFs::getEntries()[0]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip); - } - - VirtFs::deinit(); -} diff --git a/src/unittests/fs/virtfs/virtfs1_unmount.cc b/src/unittests/fs/virtfs/virtfs1_unmount.cc deleted file mode 100644 index b1c7a1033..000000000 --- a/src/unittests/fs/virtfs/virtfs1_unmount.cc +++ /dev/null @@ -1,377 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2016-2017 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "unittests/unittests.h" - -#include "fs/files.h" - -#include "fs/virtfs/direntry.h" -#include "fs/virtfs/fs.h" - -#include "utils/checkutils.h" - -#ifndef UNITTESTS_CATCH -#include <algorithm> -#endif // UNITTESTS_CATCH - -#include "debug.h" - -TEST_CASE("VirtFs1 unmount", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix; - const std::string sep = dirSeparator; - if (Files::existsLocal(name) == false) - prefix = "../"; - - SECTION("simple 2") - { - REQUIRE(VirtFs::mountDirSilentTest("dir1", - Append_true)); - REQUIRE(VirtFs::unmountDir("dir1")); - } - - SECTION("simple 3") - { - REQUIRE(VirtFs::mountDirSilentTest("dir1", - Append_true)); - REQUIRE(VirtFs::mountDirSilentTest("dir2//dir3", - Append_true)); - REQUIRE(VirtFs::mountDirSilentTest("dir3", - Append_false)); - REQUIRE(VirtFs::getEntries().size() == 3); - REQUIRE(VirtFs::unmountDir("dir1")); - REQUIRE(VirtFs::getEntries().size() == 2); - REQUIRE(VirtFs::getEntries()[0]->root == "dir3" + sep); - REQUIRE(VirtFs::getEntries()[0]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[0])->userDir == "dir3"); - REQUIRE(VirtFs::getEntries()[1]->root == "dir2" + sep + "dir3" + sep); - REQUIRE(VirtFs::getEntries()[0]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[1])->userDir == "dir2" + sep + "dir3"); - REQUIRE(VirtFs::getEntries().size() == 2); - REQUIRE(VirtFs::getEntries()[0]->root == "dir3" + sep); - REQUIRE(VirtFs::getEntries()[0]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[0])->userDir == "dir3"); - REQUIRE(VirtFs::getEntries()[1]->root == "dir2" + sep + "dir3" + sep); - REQUIRE(VirtFs::getEntries()[0]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[1])->userDir == "dir2" + sep + "dir3"); - REQUIRE(VirtFs::unmountDir("dir2/dir3")); - REQUIRE(VirtFs::getEntries().size() == 1); - REQUIRE(VirtFs::getEntries()[0]->root == "dir3" + sep); - REQUIRE(VirtFs::getEntries()[0]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[0])->userDir == "dir3"); - } - - SECTION("simple 4") - { - REQUIRE(VirtFs::mountDirSilentTest("dir1", - Append_true)); - REQUIRE(VirtFs::getEntries().size() == 1); - REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[0]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[0])->userDir == "dir1"); - REQUIRE(VirtFs::unmountDir("dir1")); - REQUIRE(VirtFs::getEntries().empty()); - REQUIRE(VirtFs::mountDirSilentTest("dir1", - Append_true)); - REQUIRE(VirtFs::getEntries().size() == 1); - REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[0]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[0])->userDir == "dir1"); - } - - SECTION("simple 5") - { - REQUIRE(VirtFs::mountZip(prefix + "data/test/test.zip", - Append_true)); - REQUIRE(VirtFs::mountZip(prefix + "data/test/test2.zip", - Append_true)); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test.zip", - std::string()) != nullptr); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test2.zip", - std::string()) != nullptr); - REQUIRE(VirtFs::getEntries().size() == 2); - REQUIRE(VirtFs::getEntries()[0]->root == - prefix + "data" + sep + "test" + sep + "test.zip"); - REQUIRE(VirtFs::getEntries()[0]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip); - REQUIRE(VirtFs::getEntries()[1]->root == - prefix + "data" + sep + "test" + sep + "test2.zip"); - REQUIRE(VirtFs::getEntries()[1]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Zip); - - VirtFs::unmountZip(prefix + "data/test/test.zip"); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test.zip", - std::string()) == nullptr); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test2.zip", - std::string()) != nullptr); - REQUIRE(VirtFs::getEntries().size() == 1); - REQUIRE(VirtFs::getEntries()[0]->root == - prefix + "data" + sep + "test" + sep + "test2.zip"); - REQUIRE(VirtFs::getEntries()[0]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip); - } - - SECTION("simple 6") - { - REQUIRE(VirtFs::mountZip(prefix + "data/test/test.zip", - Append_false)); - REQUIRE(VirtFs::mountDir(prefix + "data/test", - Append_false)); - REQUIRE(VirtFs::mountZip(prefix + "data\\test/test2.zip", - Append_false)); - - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test.zip", - std::string()) != nullptr); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test2.zip", - std::string()) != nullptr); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "", - std::string()) != nullptr); - REQUIRE(VirtFs::getEntries().size() == 3); - REQUIRE(VirtFs::getEntries()[0]->root == - prefix + "data" + sep + "test" + sep + "test2.zip"); - REQUIRE(VirtFs::getEntries()[0]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip); - REQUIRE(VirtFs::getEntries()[1]->root == - prefix + "data" + sep + "test" + sep); - REQUIRE(VirtFs::getEntries()[1]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir); - REQUIRE(VirtFs::getEntries()[2]->root == - prefix + "data" + sep + "test" + sep + "test.zip"); - REQUIRE(VirtFs::getEntries()[2]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[2]->type == FsEntryType::Zip); - - VirtFs::unmountZip(prefix + "data/test/test.zip"); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test.zip", - std::string()) == nullptr); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test2.zip", - std::string()) != nullptr); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "", - std::string()) != nullptr); - REQUIRE(VirtFs::getEntries().size() == 2); - REQUIRE(VirtFs::getEntries()[0]->root == - prefix + "data" + sep + "test" + sep + "test2.zip"); - REQUIRE(VirtFs::getEntries()[0]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip); - REQUIRE(VirtFs::getEntries()[1]->root == - prefix + "data" + sep + "test" + sep); - REQUIRE(VirtFs::getEntries()[1]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir); - } - - SECTION("subDir 2") - { - REQUIRE(VirtFs::mountDirSilentTest2("dir1", - "dir2", - Append_true)); - REQUIRE(VirtFs::unmountDir2("dir1", "dir2")); - } - - SECTION("subDir 3") - { - REQUIRE(VirtFs::mountDirSilentTest2("dir1", - "dir2", - Append_true)); - REQUIRE(VirtFs::mountDirSilentTest("dir2//dir3", - Append_true)); - REQUIRE(VirtFs::mountDirSilentTest2("dir3", - "dir4", - Append_false)); - REQUIRE(VirtFs::getEntries().size() == 3); - REQUIRE(VirtFs::unmountDir2("dir1", "dir2")); - REQUIRE(VirtFs::getEntries().size() == 2); - REQUIRE(VirtFs::getEntries()[0]->root == "dir3" + sep); - REQUIRE(VirtFs::getEntries()[0]->subDir == "dir4" + sep); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[0])->userDir == "dir3"); - REQUIRE(VirtFs::getEntries()[1]->root == "dir2" + sep + "dir3" + sep); - REQUIRE(VirtFs::getEntries()[1]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[1])->userDir == "dir2" + sep + "dir3"); - REQUIRE(VirtFs::getEntries().size() == 2); - REQUIRE(VirtFs::getEntries()[0]->root == "dir3" + sep); - REQUIRE(VirtFs::getEntries()[0]->subDir == "dir4" + sep); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[0])->userDir == "dir3"); - REQUIRE(VirtFs::getEntries()[1]->root == "dir2" + sep + "dir3" + sep); - REQUIRE(VirtFs::getEntries()[1]->subDir.empty()); - REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[1])->userDir == "dir2" + sep + "dir3"); - REQUIRE(VirtFs::unmountDir("dir2/dir3")); - REQUIRE(VirtFs::getEntries().size() == 1); - REQUIRE(VirtFs::getEntries()[0]->root == "dir3" + sep); - REQUIRE(VirtFs::getEntries()[0]->subDir == "dir4" + sep); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[0])->userDir == "dir3"); - } - - SECTION("subDir 4") - { - REQUIRE(VirtFs::mountDirSilentTest2("dir1", - "dir2", - Append_true)); - REQUIRE(VirtFs::getEntries().size() == 1); - REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[0]->subDir == "dir2" + sep); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[0])->userDir == "dir1"); - REQUIRE(VirtFs::unmountDir2("dir1", "dir2")); - REQUIRE(VirtFs::getEntries().empty()); - REQUIRE(VirtFs::mountDirSilentTest2("dir1", - "dir3", - Append_true)); - REQUIRE(VirtFs::getEntries().size() == 1); - REQUIRE(VirtFs::getEntries()[0]->root == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[0]->subDir == "dir3" + sep); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Dir); - REQUIRE(static_cast<VirtFs::DirEntry*>( - VirtFs::getEntries()[0])->userDir == "dir1"); - } - - SECTION("subDir 5") - { - REQUIRE(VirtFs::mountZip2(prefix + "data/test/test.zip", - "dir1", - Append_true)); - REQUIRE(VirtFs::mountZip2(prefix + "data/test/test2.zip", - "dir2", - Append_true)); - - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test.zip", - "dir1" + sep) != nullptr); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test2.zip", - "dir2" + sep) != nullptr); - REQUIRE(VirtFs::getEntries().size() == 2); - REQUIRE(VirtFs::getEntries()[0]->root == - prefix + "data" + sep + "test" + sep + "test.zip"); - REQUIRE(VirtFs::getEntries()[0]->subDir == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip); - REQUIRE(VirtFs::getEntries()[1]->root == - prefix + "data" + sep + "test" + sep + "test2.zip"); - REQUIRE(VirtFs::getEntries()[1]->subDir == "dir2" + sep); - REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Zip); - - VirtFs::unmountZip2(prefix + "data/test/test.zip", - "dir1"); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test.zip", - std::string()) == nullptr); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test2.zip", - "dir2" + sep) != nullptr); - REQUIRE(VirtFs::getEntries().size() == 1); - REQUIRE(VirtFs::getEntries()[0]->root == - prefix + "data" + sep + "test" + sep + "test2.zip"); - REQUIRE(VirtFs::getEntries()[0]->subDir == "dir2" + sep); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip); - } - - SECTION("subDir 6") - { - REQUIRE(VirtFs::mountZip2(prefix + "data/test/test.zip", - "dir1", - Append_false)); - REQUIRE(VirtFs::mountDir2(prefix + "data/test", - "dir2", - Append_false)); - REQUIRE(VirtFs::mountZip2(prefix + "data\\test/test2.zip", - "dir3", - Append_false)); - - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test.zip", - "dir1" + sep) != nullptr); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test2.zip", - "dir3" + sep) != nullptr); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "", - "dir2" + sep) != nullptr); - REQUIRE(VirtFs::getEntries().size() == 3); - REQUIRE(VirtFs::getEntries()[0]->root == - prefix + "data" + sep + "test" + sep + "test2.zip"); - REQUIRE(VirtFs::getEntries()[0]->subDir == "dir3" + sep); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip); - REQUIRE(VirtFs::getEntries()[1]->root == - prefix + "data" + sep + "test" + sep); - REQUIRE(VirtFs::getEntries()[1]->subDir == "dir2" + sep); - REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir); - REQUIRE(VirtFs::getEntries()[2]->root == - prefix + "data" + sep + "test" + sep + "test.zip"); - REQUIRE(VirtFs::getEntries()[2]->subDir == "dir1" + sep); - REQUIRE(VirtFs::getEntries()[2]->type == FsEntryType::Zip); - - VirtFs::unmountZip2(prefix + "data/test/test.zip", - "dir1"); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test.zip", - "dir1" + sep) == nullptr); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "test2.zip", - "dir3" + sep) != nullptr); - REQUIRE(VirtFs::searchByRootInternal( - prefix + "data" + sep + "test" + sep + "", - "dir2" + sep) != nullptr); - REQUIRE(VirtFs::getEntries().size() == 2); - REQUIRE(VirtFs::getEntries()[0]->root == - prefix + "data" + sep + "test" + sep + "test2.zip"); - REQUIRE(VirtFs::getEntries()[0]->subDir == "dir3" + sep); - REQUIRE(VirtFs::getEntries()[0]->type == FsEntryType::Zip); - REQUIRE(VirtFs::getEntries()[1]->root == - prefix + "data" + sep + "test" + sep); - REQUIRE(VirtFs::getEntries()[1]->subDir == "dir2" + sep); - REQUIRE(VirtFs::getEntries()[1]->type == FsEntryType::Dir); - } - - VirtFs::deinit(); -} diff --git a/src/unittests/fs/virtfs/virtfs2.cc b/src/unittests/fs/virtfs/virtfs2.cc deleted file mode 100644 index a1a1050aa..000000000 --- a/src/unittests/fs/virtfs/virtfs2.cc +++ /dev/null @@ -1,1643 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2016-2017 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "unittests/unittests.h" - -#include "fs/files.h" - -#include "fs/virtfs/fs.h" -#include "fs/virtfs/rwops.h" - -#include "utils/checkutils.h" -#include "utils/foreach.h" -#include "utils/stringutils.h" - -PRAGMA48(GCC diagnostic push) -PRAGMA48(GCC diagnostic ignored "-Wshadow") -#include <SDL_rwops.h> -PRAGMA48(GCC diagnostic pop) - -#ifndef UNITTESTS_CATCH -#include <algorithm> -#endif // UNITTESTS_CATCH - -#include "debug.h" - -static bool inList(StringVect list, - const std::string &name) -{ - FOR_EACH (StringVectCIter, it, list) - { - if (*it == name) - return true; - } - return false; -} - -static bool inList(StringVect list, - const std::string &dir, - const std::string &name) -{ - const std::string path = pathJoin(dir, name); - FOR_EACH (StringVectCIter, it, list) - { - if (*it == path) - return true; - } - return false; -} - -static void removeTemp(StringVect &restrict list) -{ - int cnt = 0; - std::sort(list.begin(), list.end()); - - FOR_EACH (StringVectIter, it, list) - { - if (*it != "serverlistplus.xml.part") - { - logger->log("file: %d %s", - cnt, - (*it).c_str()); - cnt ++; - } - } - - FOR_EACH (StringVectIter, it, list) - { - if (*it == "serverlistplus.xml.part") - { - list.erase(it); - return; - } - } -} - -TEST_CASE("VirtFs2 isDirectory1", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountDir(prefix + "data", - Append_false); - - REQUIRE(VirtFs::isDirectory("test/units.xml") == false); - REQUIRE(VirtFs::isDirectory("test/units.xml/") == false); - REQUIRE(VirtFs::isDirectory("test//units.xml") == false); - REQUIRE(VirtFs::isDirectory("test/units123.xml") == false); - REQUIRE(VirtFs::isDirectory("test//units123.xml") == false); - REQUIRE(VirtFs::isDirectory("tesQ/units.xml") == false); - REQUIRE(VirtFs::isDirectory("tesQ//units.xml") == false); - REQUIRE(VirtFs::isDirectory("units.xml") == false); - REQUIRE(VirtFs::isDirectory("test") == true); - REQUIRE(VirtFs::isDirectory("test/") == true); - REQUIRE(VirtFs::isDirectory("test//") == true); - REQUIRE(VirtFs::isDirectory("test/dir1") == true); - REQUIRE(VirtFs::isDirectory("test//dir1") == true); - REQUIRE(VirtFs::isDirectory("test//dir1/") == true); - REQUIRE(VirtFs::isDirectory("test//dir1//") == true); - REQUIRE(VirtFs::isDirectory("test\\dir1/") == true); - REQUIRE(VirtFs::isDirectory("test/dir1//") == true); - REQUIRE(VirtFs::isDirectory("testQ") == false); - REQUIRE(VirtFs::isDirectory("testQ/") == false); - REQUIRE(VirtFs::isDirectory("testQ//") == false); - - VirtFs::mountDir(prefix + "data/test", - Append_false); - - REQUIRE(VirtFs::isDirectory("test/units.xml") == false); - REQUIRE(VirtFs::isDirectory("test/units.xml/") == false); - REQUIRE(VirtFs::isDirectory("test//units.xml") == false); - REQUIRE(VirtFs::isDirectory("test/units123.xml") == false); - REQUIRE(VirtFs::isDirectory("tesQ/units.xml") == false); - REQUIRE(VirtFs::isDirectory("units.xml") == false); - REQUIRE(VirtFs::isDirectory("test") == true); - REQUIRE(VirtFs::isDirectory("testQ") == false); - REQUIRE(VirtFs::isDirectory("test/dir1") == true); - REQUIRE(VirtFs::isDirectory("test\\dir1") == true); - - VirtFs::unmountDir(prefix + "data/test"); - - REQUIRE(VirtFs::isDirectory("test/units.xml") == false); - REQUIRE(VirtFs::isDirectory("test/units123.xml") == false); - REQUIRE(VirtFs::isDirectory("tesQ/units.xml") == false); - REQUIRE(VirtFs::isDirectory("units.xml") == false); - REQUIRE(VirtFs::isDirectory("units.xml/") == false); - REQUIRE(VirtFs::isDirectory("test") == true); - REQUIRE(VirtFs::isDirectory("test/") == true); - REQUIRE(VirtFs::isDirectory("testQ") == false); - REQUIRE(VirtFs::isDirectory("test/dir1") == true); - - VirtFs::unmountDirSilent(prefix + "data"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFs2 isDirectory2", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip(prefix + "data/test/test2.zip", - Append_false); - - REQUIRE(VirtFs::isDirectory("dir2/units.xml") == false); - REQUIRE(VirtFs::isDirectory("dir2/units.xml/") == false); - REQUIRE(VirtFs::isDirectory("dir2//units.xml") == false); - REQUIRE(VirtFs::isDirectory("dir2/units123.xml") == false); - REQUIRE(VirtFs::isDirectory("dir2//units123.xml") == false); - REQUIRE(VirtFs::isDirectory("tesQ/units.xml") == false); - REQUIRE(VirtFs::isDirectory("tesQ//units.xml") == false); - REQUIRE(VirtFs::isDirectory("units.xml") == false); - REQUIRE(VirtFs::isDirectory("dir") == true); - REQUIRE(VirtFs::isDirectory("dir2/") == true); - REQUIRE(VirtFs::isDirectory("dir2//") == true); - REQUIRE(VirtFs::isDirectory("dir/1") == true); - REQUIRE(VirtFs::isDirectory("dir//1") == true); - REQUIRE(VirtFs::isDirectory("dir\\1/") == true); - REQUIRE(VirtFs::isDirectory("dir/1") == true); - REQUIRE(VirtFs::isDirectory("dir/1/zzz") == false); - REQUIRE(VirtFs::isDirectory("test/dir1\\") == false); - REQUIRE(VirtFs::isDirectory("testQ") == false); - REQUIRE(VirtFs::isDirectory("testQ/") == false); - REQUIRE(VirtFs::isDirectory("testQ//") == false); - - VirtFs::mountZip(prefix + "data/test/test.zip", - Append_false); - - REQUIRE(VirtFs::isDirectory("dir2/units.xml") == false); - REQUIRE(VirtFs::isDirectory("dir2/units.xml/") == false); - REQUIRE(VirtFs::isDirectory("dir2\\units.xml") == false); - REQUIRE(VirtFs::isDirectory("dir2/units123.xml") == false); - REQUIRE(VirtFs::isDirectory("dir2//units123.xml") == false); - REQUIRE(VirtFs::isDirectory("tesQ/units.xml") == false); - REQUIRE(VirtFs::isDirectory("tesQ//units.xml") == false); - REQUIRE(VirtFs::isDirectory("units.xml") == false); - REQUIRE(VirtFs::isDirectory("dir") == true); - REQUIRE(VirtFs::isDirectory("dir2/") == true); - REQUIRE(VirtFs::isDirectory("dir2\\") == true); - REQUIRE(VirtFs::isDirectory("dir/1") == true); - REQUIRE(VirtFs::isDirectory("dir//1") == true); - REQUIRE(VirtFs::isDirectory("dir//1/") == true); - REQUIRE(VirtFs::isDirectory("dir/1") == true); - REQUIRE(VirtFs::isDirectory("dir/1/zzz") == false); - REQUIRE(VirtFs::isDirectory("test/dir1//") == false); - REQUIRE(VirtFs::isDirectory("testQ") == false); - REQUIRE(VirtFs::isDirectory("testQ/") == false); - REQUIRE(VirtFs::isDirectory("testQ//") == false); - - VirtFs::unmountZip(prefix + "data/test/test2.zip"); - - REQUIRE(VirtFs::isDirectory("dir2/units.xml") == false); - REQUIRE(VirtFs::isDirectory("dir2/units.xml/") == false); - REQUIRE(VirtFs::isDirectory("dir2//units.xml") == false); - REQUIRE(VirtFs::isDirectory("dir2/units123.xml") == false); - REQUIRE(VirtFs::isDirectory("dir2//units123.xml") == false); - REQUIRE(VirtFs::isDirectory("tesQ/units.xml") == false); - REQUIRE(VirtFs::isDirectory("tesQ//units.xml") == false); - REQUIRE(VirtFs::isDirectory("units.xml") == false); - REQUIRE(VirtFs::isDirectory("dir") == true); - REQUIRE(VirtFs::isDirectory("dir2/") == false); - REQUIRE(VirtFs::isDirectory("dir2//") == false); - REQUIRE(VirtFs::isDirectory("dir/1") == false); - REQUIRE(VirtFs::isDirectory("dir\\1") == false); - REQUIRE(VirtFs::isDirectory("dir//1/") == false); - REQUIRE(VirtFs::isDirectory("dir/1") == false); - REQUIRE(VirtFs::isDirectory("dir/1/zzz") == false); - REQUIRE(VirtFs::isDirectory("test/dir1//") == false); - REQUIRE(VirtFs::isDirectory("testQ") == false); - REQUIRE(VirtFs::isDirectory("testQ/") == false); - REQUIRE(VirtFs::isDirectory("testQ//") == false); - - VirtFs::unmountZip(prefix + "data/test/test.zip"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFs2 isDirectory3", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountDir2(prefix + "data", - "test", - Append_false); - - REQUIRE(VirtFs::isDirectory("units.xml") == false); - REQUIRE(VirtFs::isDirectory("units.xml/") == false); - REQUIRE(VirtFs::isDirectory("units123.xml") == false); - REQUIRE(VirtFs::isDirectory("tesQ/units.xml") == false); - REQUIRE(VirtFs::isDirectory("tesQ//units.xml") == false); - REQUIRE(VirtFs::isDirectory("test") == false); - REQUIRE(VirtFs::isDirectory("dir1") == true); - REQUIRE(VirtFs::isDirectory("dir2//") == true); - REQUIRE(VirtFs::isDirectory("test/dir1") == false); - REQUIRE(VirtFs::isDirectory("testQ") == false); - REQUIRE(VirtFs::isDirectory("testQ/") == false); - REQUIRE(VirtFs::isDirectory("testQ//") == false); - - VirtFs::unmountDirSilent2(prefix + "data", - "test"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFs2 isDirectory4", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip2(prefix + "data/test/test2.zip", - "dir", - Append_false); - - REQUIRE(VirtFs::isDirectory("dir2/units.xml") == false); - REQUIRE(VirtFs::isDirectory("dir2/units.xml/") == false); - REQUIRE(VirtFs::isDirectory("dir2//units.xml") == false); - REQUIRE(VirtFs::isDirectory("dir2/units123.xml") == false); - REQUIRE(VirtFs::isDirectory("dir2//units123.xml") == false); - REQUIRE(VirtFs::isDirectory("tesQ/units.xml") == false); - REQUIRE(VirtFs::isDirectory("tesQ//units.xml") == false); - REQUIRE(VirtFs::isDirectory("units.xml") == false); - REQUIRE(VirtFs::isDirectory("1") == true); - REQUIRE(VirtFs::isDirectory("gpl") == true); - REQUIRE(VirtFs::isDirectory("dir2/") == false); - REQUIRE(VirtFs::isDirectory("dir/1") == false); - REQUIRE(VirtFs::isDirectory("dir/1/zzz") == false); - REQUIRE(VirtFs::isDirectory("test/dir1\\") == false); - REQUIRE(VirtFs::isDirectory("testQ") == false); - REQUIRE(VirtFs::isDirectory("testQ/") == false); - REQUIRE(VirtFs::isDirectory("testQ//") == false); - - VirtFs::unmountZip2(prefix + "data/test/test2.zip", - "dir"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFs2 openRead1", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountDir(prefix + "data", - Append_false); - - VirtFs::File *file = nullptr; - - file = VirtFs::openRead("test/units.xml"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("test\\units.xml"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("test/units123.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("tesQ/units.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("units.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("testQ"); - REQUIRE(file == nullptr); - - VirtFs::mountDir(prefix + "data/test", - Append_false); - - file = VirtFs::openRead("test/units.xml"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("test/units123.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("tesQ/units.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("units.xml"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("testQ"); - REQUIRE(file == nullptr); - - VirtFs::unmountDir(prefix + "data/test"); - - file = VirtFs::openRead("test/units.xml"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("test/units123.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("tesQ/units.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("units.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("testQ"); - REQUIRE(file == nullptr); - - VirtFs::unmountDir(prefix + "data"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFs2 openRead2", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix("data/test/"); - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip(prefix + "test2.zip", - Append_false); - - VirtFs::File *file = nullptr; - - file = VirtFs::openRead("dir2/units.xml"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("dir2\\units.xml"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("dir2/units123.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("tesQ/units.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("units.xml1"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("testQ"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("dir/brimmedhat.png"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("dir//brimmedhat.png"); - REQUIRE(file == nullptr); - - VirtFs::mountZip(prefix + "test.zip", - Append_false); - - file = VirtFs::openRead("dir2/units.xml"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("dir2//units.xml"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("dir2/units123.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("tesQ/units.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("units.xml1"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("testQ"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("dir/brimmedhat.png"); - REQUIRE(file != nullptr); - VirtFs::close(file); - - VirtFs::unmountZip(prefix + "test.zip"); - - file = VirtFs::openRead("dir2/units.xml"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("dir2\\/\\units.xml"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("dir2/units123.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("tesQ/units.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("units.xml1"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("testQ"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("dir/brimmedhat.png"); - REQUIRE(file == nullptr); - - VirtFs::unmountZip(prefix + "test2.zip"); - - VirtFs::deinit(); -} - -TEST_CASE("VirtFs2 openRead3", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountDir2(prefix + "data", - "test", - Append_false); - - VirtFs::File *file = nullptr; - - file = VirtFs::openRead("units.xml"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("test/units.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("units123.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("tesQ/units.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("testQ"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("file1.txt"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("file2.txt"); - REQUIRE(file == nullptr); - - VirtFs::mountDir2(prefix + "data/test", - "dir2", - Append_false); - - file = VirtFs::openRead("units.xml"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("test/units.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("units123.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("tesQ/units.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("testQ"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("file1.txt"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("file2.txt"); - REQUIRE(file != nullptr); - VirtFs::close(file); - - VirtFs::unmountDir2(prefix + "data/test", - "dir2"); - - file = VirtFs::openRead("units.xml"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("test/units.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("units123.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("tesQ/units.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("testQ"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("file1.txt"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("file2.txt"); - REQUIRE(file == nullptr); - - VirtFs::unmountDir2(prefix + "data", - "test"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFs2 openRead4", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix("data/test/"); - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip2(prefix + "test2.zip", - "dir", - Append_false); - - VirtFs::File *file = nullptr; - - file = VirtFs::openRead("dye.png"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("1\\test.txt"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("dir/dye.png"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("tesQ/units.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("dye.png1"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("testQ"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("brimmedhat.png"); - REQUIRE(file == nullptr); - - VirtFs::mountZip2(prefix + "test.zip", - "dir", - Append_false); - - file = VirtFs::openRead("dye.png"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("1\\test.txt"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("dir/dye.png"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("tesQ/units.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("dye.png1"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("testQ"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("brimmedhat.png"); - REQUIRE(file != nullptr); - VirtFs::close(file); - - VirtFs::unmountZip2(prefix + "test.zip", - "dir"); - - file = VirtFs::openRead("dye.png"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("1\\test.txt"); - REQUIRE(file != nullptr); - VirtFs::close(file); - file = VirtFs::openRead("dir/dye.png"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("tesQ/units.xml"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("dye.png1"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("testQ"); - REQUIRE(file == nullptr); - file = VirtFs::openRead("brimmedhat.png"); - REQUIRE(file == nullptr); - - VirtFs::unmountZip2(prefix + "test2.zip", - "dir"); - - VirtFs::deinit(); -} - -TEST_CASE("VirtFs2 permitLinks", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountDir(prefix + "data", - Append_false); - - const int cnt1 = VirtFs::exists("test/test2.txt") ? 26 : 25; - const int cnt2 = 26; - - StringVect list; - VirtFs::permitLinks(false); - VirtFs::getFiles("test", list); - removeTemp(list); - const size_t sz = list.size(); - REQUIRE(sz == cnt1); - - list.clear(); - VirtFs::permitLinks(true); - VirtFs::getFiles("test", list); - removeTemp(list); - REQUIRE(list.size() == cnt2); - - list.clear(); - VirtFs::permitLinks(false); - VirtFs::getFiles("test", list); - removeTemp(list); - REQUIRE(list.size() == cnt1); - - VirtFs::unmountDirSilent(prefix + "data"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFs2 read1", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountDir(prefix + "data", - Append_false); - - VirtFs::File *file = VirtFs::openRead("test/test.txt"); - REQUIRE(file != nullptr); - REQUIRE(VirtFs::fileLength(file) == 23); - const int fileSize = VirtFs::fileLength(file); - - void *restrict buffer = calloc(fileSize + 1, 1); - REQUIRE(VirtFs::read(file, buffer, 1, fileSize) == fileSize); - REQUIRE(strcmp(static_cast<char*>(buffer), - "test line 1\ntest line 2") == 0); - REQUIRE(VirtFs::tell(file) == fileSize); - REQUIRE(VirtFs::eof(file) != 0); - - free(buffer); - buffer = calloc(fileSize + 1, 1); - REQUIRE(VirtFs::seek(file, 12) != 0); - REQUIRE(VirtFs::eof(file) == 0); - REQUIRE(VirtFs::tell(file) == 12); - REQUIRE(VirtFs::read(file, buffer, 1, 11) == 11); - REQUIRE(strcmp(static_cast<char*>(buffer), - "test line 2") == 0); - REQUIRE(VirtFs::eof(file) != 0); - - VirtFs::close(file); - free(buffer); - - VirtFs::unmountDir(prefix + "data"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFs2 read2", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix("data/test/"); - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip(prefix + "test2.zip", - Append_false); - VirtFs::File *file = nullptr; - void *restrict buffer = nullptr; - - SECTION("test 1") - { - file = VirtFs::openRead("dir2//test.txt"); - REQUIRE(file != nullptr); - REQUIRE(VirtFs::fileLength(file) == 23); - const int fileSize = VirtFs::fileLength(file); - - buffer = calloc(fileSize + 1, 1); - REQUIRE(VirtFs::read(file, buffer, 1, fileSize) == fileSize); - REQUIRE(strcmp(static_cast<char*>(buffer), - "test line 1\ntest line 2") == 0); - REQUIRE(VirtFs::tell(file) == fileSize); - REQUIRE(VirtFs::eof(file) != 0); - } - - SECTION("test 2") - { - file = VirtFs::openRead("dir2\\/test.txt"); - REQUIRE(file != nullptr); - REQUIRE(VirtFs::fileLength(file) == 23); - const int fileSize = VirtFs::fileLength(file); - - buffer = calloc(fileSize + 1, 1); - REQUIRE(VirtFs::seek(file, 12) != 0); - REQUIRE(VirtFs::eof(file) == 0); - REQUIRE(VirtFs::tell(file) == 12); - REQUIRE(VirtFs::read(file, buffer, 1, 11) == 11); - REQUIRE(strcmp(static_cast<char*>(buffer), - "test line 2") == 0); - REQUIRE(VirtFs::eof(file) != 0); - } - - SECTION("test 3") - { - file = VirtFs::openRead("dir2//test.txt"); - REQUIRE(file != nullptr); - const int fileSize = VirtFs::fileLength(file); - - buffer = calloc(fileSize + 1, 1); - for (int f = 0; f < fileSize; f ++) - { - REQUIRE(VirtFs::seek(file, f) != 0); - REQUIRE(VirtFs::eof(file) == 0); - REQUIRE(VirtFs::tell(file) == f); - } - } - - SECTION("test 4") - { - file = VirtFs::openRead("dir2/test.txt"); - REQUIRE(file != nullptr); - const int fileSize = VirtFs::fileLength(file); - const char *restrict const str = "test line 1\ntest line 2"; - buffer = calloc(fileSize + 1, 1); - for (int f = 0; f < fileSize - 1; f ++) - { - REQUIRE(VirtFs::read(file, buffer, 1, 1) == 1); - REQUIRE(static_cast<char*>(buffer)[0] == str[f]); - REQUIRE(VirtFs::eof(file) == 0); - REQUIRE(VirtFs::tell(file) == f + 1); - } - REQUIRE(VirtFs::read(file, buffer, 1, 1) == 1); - REQUIRE(static_cast<char*>(buffer)[0] == str[22]); - REQUIRE(VirtFs::eof(file) != 0); - REQUIRE(VirtFs::tell(file) == fileSize); - } - - SECTION("test 5") - { - file = VirtFs::openRead("dir2\\\\test.txt"); - REQUIRE(file != nullptr); - const int fileSize = VirtFs::fileLength(file); - const char *restrict const str = "test line 1\ntest line 2"; - buffer = calloc(fileSize + 1, 1); - for (int f = 0; f < fileSize - 1; f += 2) - { - REQUIRE(VirtFs::read(file, buffer, 2, 1) == 1); - REQUIRE(static_cast<char*>(buffer)[0] == str[f]); - REQUIRE(static_cast<char*>(buffer)[1] == str[f + 1]); - REQUIRE(VirtFs::eof(file) == 0); - REQUIRE(VirtFs::tell(file) == f + 2); - } - REQUIRE(VirtFs::eof(file) == 0); - REQUIRE(VirtFs::tell(file) == 22); - REQUIRE(VirtFs::read(file, buffer, 2, 1) == 0); - REQUIRE(VirtFs::eof(file) == 0); - } - - SECTION("test 6") - { - file = VirtFs::openRead("dir2//test.txt"); - REQUIRE(file != nullptr); - const int fileSize = VirtFs::fileLength(file); - const char *restrict const str = "test line 1\ntest line 2"; - buffer = calloc(fileSize + 1, 1); - for (int f = 0; f < fileSize - 1; f += 2) - { - REQUIRE(VirtFs::read(file, buffer, 1, 2) == 2); - REQUIRE(static_cast<char*>(buffer)[0] == str[f]); - REQUIRE(static_cast<char*>(buffer)[1] == str[f + 1]); - REQUIRE(VirtFs::eof(file) == 0); - REQUIRE(VirtFs::tell(file) == f + 2); - } - REQUIRE(VirtFs::eof(file) == 0); - REQUIRE(VirtFs::tell(file) == 22); - REQUIRE(VirtFs::read(file, buffer, 1, 2) == 1); - REQUIRE(static_cast<char*>(buffer)[0] == str[22]); - REQUIRE(VirtFs::eof(file) != 0); - } - - VirtFs::close(file); - free(buffer); - VirtFs::unmountZip(prefix + "test2.zip"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFs2 loadFile1", "") -{ - VirtFs::init("."); - int fileSize = 0; - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountDir(prefix + "data", - Append_false); - - const char *const buffer = VirtFs::loadFile("test/test.txt", fileSize); - REQUIRE(static_cast<const void*>(buffer) != nullptr); - REQUIRE(fileSize == 23); - REQUIRE(strncmp(buffer, "test line 1\ntest line 2", 23) == 0); - delete [] buffer; - - VirtFs::unmountDir(prefix + "data"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFs2 loadFile2", "") -{ - VirtFs::init("."); - int fileSize = 0; - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip(prefix + "data/test/test2.zip", - Append_false); - - SECTION("test 1") - { - const char *restrict buffer = VirtFs::loadFile("dir2//test.txt", - fileSize); - REQUIRE(static_cast<const void*>(buffer) != nullptr); - REQUIRE(fileSize == 23); - REQUIRE(strncmp(buffer, "test line 1\ntest line 2", 23) == 0); - delete [] buffer; - } - - SECTION("test 2") - { - const char *restrict buffer = VirtFs::loadFile("dir2\\/test.txt", - fileSize); - REQUIRE(static_cast<const void*>(buffer) != nullptr); - REQUIRE(fileSize == 23); - REQUIRE(strncmp(buffer, "test line 1\ntest line 2", 23) == 0); - delete [] buffer; - } - - VirtFs::unmountZip(prefix + "data/test/test2.zip"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFs2 loadFile3", "") -{ - VirtFs::init("."); - int fileSize = 0; - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountDir2(prefix + "data", - "test", - Append_false); - - const char *const buffer = VirtFs::loadFile("test.txt", fileSize); - REQUIRE(static_cast<const void*>(buffer) != nullptr); - REQUIRE(fileSize == 23); - REQUIRE(strncmp(buffer, "test line 1\ntest line 2", 23) == 0); - delete [] buffer; - - VirtFs::unmountDir2(prefix + "data", - "test"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFs2 loadFile4", "") -{ - VirtFs::init("."); - int fileSize = 0; - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip2(prefix + "data/test/test2.zip", - "dir2", - Append_false); - - SECTION("test 1") - { - const char *restrict buffer = VirtFs::loadFile("test.txt", - fileSize); - REQUIRE(static_cast<const void*>(buffer) != nullptr); - REQUIRE(fileSize == 23); - REQUIRE(strncmp(buffer, "test line 1\ntest line 2", 23) == 0); - delete [] buffer; - } - - SECTION("test 2") - { - const char *restrict buffer = VirtFs::loadFile("test.txt", - fileSize); - REQUIRE(static_cast<const void*>(buffer) != nullptr); - REQUIRE(fileSize == 23); - REQUIRE(strncmp(buffer, "test line 1\ntest line 2", 23) == 0); - delete [] buffer; - } - - VirtFs::unmountZip2(prefix + "data/test/test2.zip", - "dir2"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFs2 rwops_read1", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountDir(prefix + "data", - Append_false); - - SDL_RWops *file = VirtFs::rwopsOpenRead("test/test.txt"); - REQUIRE(file != nullptr); -#ifdef USE_SDL2 - REQUIRE(file->size(file) == 23); -#endif // USE_SDL2 - - const int fileSize = 23; - - void *restrict buffer = calloc(fileSize + 1, 1); - REQUIRE(file->read(file, buffer, 1, fileSize) == fileSize); - REQUIRE(strcmp(static_cast<char*>(buffer), - "test line 1\ntest line 2") == 0); - REQUIRE(file->seek(file, 0, SEEK_CUR) == fileSize); - - free(buffer); - buffer = calloc(fileSize + 1, 1); - REQUIRE(file->seek(file, 12, SEEK_SET) != 0); - REQUIRE(file->seek(file, 0, SEEK_CUR) == 12); - REQUIRE(file->read(file, buffer, 1, 11) == 11); - REQUIRE(strcmp(static_cast<char*>(buffer), - "test line 2") == 0); - - file->close(file); - free(buffer); - - VirtFs::unmountDir(prefix + "data"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFs2 rwops_read2", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix("data/test/"); - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip(prefix + "test2.zip", - Append_false); - SDL_RWops *file = nullptr; - void *restrict buffer = nullptr; - - SECTION("test 1") - { - file = VirtFs::rwopsOpenRead("dir2//test.txt"); - REQUIRE(file != nullptr); -#ifdef USE_SDL2 - REQUIRE(file->size(file) == 23); -#endif // USE_SDL2 - const int fileSize = 23; - - buffer = calloc(fileSize + 1, 1); - REQUIRE(file->read(file, buffer, 1, fileSize) == fileSize); - REQUIRE(strcmp(static_cast<char*>(buffer), - "test line 1\ntest line 2") == 0); - REQUIRE(file->seek(file, 0, SEEK_CUR) == fileSize); - } - - SECTION("test 2") - { - file = VirtFs::rwopsOpenRead("dir2\\/test.txt"); - REQUIRE(file != nullptr); -#ifdef USE_SDL2 - REQUIRE(file->size(file) == 23); -#endif // USE_SDL2 - const int fileSize = 23; - - buffer = calloc(fileSize + 1, 1); - REQUIRE(file->seek(file, 12, SEEK_SET) != 0); - REQUIRE(file->seek(file, 0, SEEK_CUR) == 12); - REQUIRE(file->read(file, buffer, 1, 11) == 11); - REQUIRE(strcmp(static_cast<char*>(buffer), - "test line 2") == 0); - } - - SECTION("test 3") - { - file = VirtFs::rwopsOpenRead("dir2//test.txt"); - REQUIRE(file != nullptr); - const int fileSize = 23; - - buffer = calloc(fileSize + 1, 1); - for (int f = 0; f < fileSize; f ++) - { - REQUIRE(file->seek(file, f, SEEK_SET) == f); - REQUIRE(file->seek(file, 0, SEEK_CUR) == f); - } - } - - SECTION("test 4") - { - file = VirtFs::rwopsOpenRead("dir2/test.txt"); - REQUIRE(file != nullptr); - const int fileSize = 23; - const char *restrict const str = "test line 1\ntest line 2"; - buffer = calloc(fileSize + 1, 1); - for (int f = 0; f < fileSize - 1; f ++) - { - REQUIRE(file->read(file, buffer, 1, 1) == 1); - REQUIRE(static_cast<char*>(buffer)[0] == str[f]); - REQUIRE(file->seek(file, 0, SEEK_CUR) == f + 1); - } - REQUIRE(file->read(file, buffer, 1, 1) == 1); - REQUIRE(static_cast<char*>(buffer)[0] == str[22]); - REQUIRE(file->seek(file, 0, SEEK_CUR) == fileSize); - } - - SECTION("test 5") - { - file = VirtFs::rwopsOpenRead("dir2\\\\test.txt"); - REQUIRE(file != nullptr); - const int fileSize = 23; - const char *restrict const str = "test line 1\ntest line 2"; - buffer = calloc(fileSize + 1, 1); - for (int f = 0; f < fileSize - 1; f += 2) - { - REQUIRE(file->read(file, buffer, 2, 1) == 1); - REQUIRE(static_cast<char*>(buffer)[0] == str[f]); - REQUIRE(static_cast<char*>(buffer)[1] == str[f + 1]); - REQUIRE(file->seek(file, 0, SEEK_CUR) == f + 2); - } - REQUIRE(file->seek(file, 0, SEEK_CUR) == 22); - REQUIRE(file->read(file, buffer, 2, 1) == 0); - } - - SECTION("test 6") - { - file = VirtFs::rwopsOpenRead("dir2//test.txt"); - REQUIRE(file != nullptr); - const int fileSize = 23; - const char *restrict const str = "test line 1\ntest line 2"; - buffer = calloc(fileSize + 1, 1); - for (int f = 0; f < fileSize - 1; f += 2) - { - REQUIRE(file->read(file, buffer, 1, 2) == 2); - REQUIRE(static_cast<char*>(buffer)[0] == str[f]); - REQUIRE(static_cast<char*>(buffer)[1] == str[f + 1]); - REQUIRE(file->seek(file, 0, SEEK_CUR) == f + 2); - } - REQUIRE(file->seek(file, 0, SEEK_CUR) == 22); - REQUIRE(file->read(file, buffer, 1, 2) == 1); - REQUIRE(static_cast<char*>(buffer)[0] == str[22]); - } - - SECTION("test 7") - { - file = VirtFs::rwopsOpenRead("dir2//test.txt"); - REQUIRE(file != nullptr); - const int fileSize = 23; - const char *restrict const str = "test line 1\ntest line 2"; - buffer = calloc(fileSize + 1, 1); - for (int f = 0; f < fileSize - 1; f += 2) - { - REQUIRE(file->read(file, buffer, 1, 2) == 2); - REQUIRE(file->seek(file, -2, SEEK_CUR) == f); - REQUIRE(file->seek(file, 0, SEEK_CUR) == f); - REQUIRE(file->seek(file, 2, SEEK_CUR) == f + 2); - REQUIRE(static_cast<char*>(buffer)[0] == str[f]); - REQUIRE(static_cast<char*>(buffer)[1] == str[f + 1]); - REQUIRE(file->seek(file, 0, SEEK_CUR) == f + 2); - } - REQUIRE(file->seek(file, 0, SEEK_CUR) == 22); - REQUIRE(file->read(file, buffer, 1, 2) == 1); - REQUIRE(static_cast<char*>(buffer)[0] == str[22]); - } - - SECTION("test 8") - { - file = VirtFs::rwopsOpenRead("dir2//test.txt"); - REQUIRE(file != nullptr); - const int fileSize = 23; - const char *restrict const str = "test line 1\ntest line 2"; - buffer = calloc(fileSize + 1, 1); - for (int f = 0; f < fileSize - 1; f += 2) - { - REQUIRE(file->seek(file, -f - 2, SEEK_END) == 23 - f - 2); - REQUIRE(file->read(file, buffer, 1, 2) == 2); - REQUIRE(static_cast<char*>(buffer)[0] == str[23 - f - 2]); - REQUIRE(static_cast<char*>(buffer)[1] == str[23 - f - 2 + 1]); - REQUIRE(file->seek(file, 0, SEEK_CUR) == 23 - f); - } - // 3 - REQUIRE(file->seek(file, 1, SEEK_CUR) == 4); - // 4 - REQUIRE(file->read(file, buffer, 1, 2) == 2); - // 6 - REQUIRE(static_cast<char*>(buffer)[0] == str[4]); - REQUIRE(static_cast<char*>(buffer)[1] == str[5]); - REQUIRE(file->seek(file, -7, SEEK_CUR) == -1); - REQUIRE(file->seek(file, 6, SEEK_SET) == 6); - REQUIRE(file->seek(file, -6, SEEK_CUR) == 0); - } - - if (file != nullptr) - file->close(file); - free(buffer); - VirtFs::unmountZip(prefix + "test2.zip"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFs2 rwops_read3", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountDir(prefix + "data", - Append_false); - SDL_RWops *file = nullptr; - void *restrict buffer = nullptr; - - SECTION("test 1") - { - file = VirtFs::rwopsOpenRead("test/test.txt"); - REQUIRE(file != nullptr); -#ifdef USE_SDL2 - REQUIRE(file->size(file) == 23); -#endif // USE_SDL2 - const int fileSize = 23; - - buffer = calloc(fileSize + 1, 1); - REQUIRE(file->read(file, buffer, 1, fileSize) == fileSize); - REQUIRE(strcmp(static_cast<char*>(buffer), - "test line 1\ntest line 2") == 0); - REQUIRE(file->seek(file, 0, SEEK_CUR) == fileSize); - } - - SECTION("test 2") - { - file = VirtFs::rwopsOpenRead("test\\test.txt"); - REQUIRE(file != nullptr); -#ifdef USE_SDL2 - REQUIRE(file->size(file) == 23); -#endif // USE_SDL2 - const int fileSize = 23; - - buffer = calloc(fileSize + 1, 1); - REQUIRE(file->seek(file, 12, SEEK_SET) != 0); - REQUIRE(file->seek(file, 0, SEEK_CUR) == 12); - REQUIRE(file->read(file, buffer, 1, 11) == 11); - REQUIRE(strcmp(static_cast<char*>(buffer), - "test line 2") == 0); - } - - SECTION("test 3") - { - file = VirtFs::rwopsOpenRead("test\\/test.txt"); - REQUIRE(file != nullptr); - const int fileSize = 23; - - buffer = calloc(fileSize + 1, 1); - for (int f = 0; f < fileSize; f ++) - { - REQUIRE(file->seek(file, f, SEEK_SET) == f); - REQUIRE(file->seek(file, 0, SEEK_CUR) == f); - } - } - - SECTION("test 4") - { - file = VirtFs::rwopsOpenRead("test/test.txt"); - REQUIRE(file != nullptr); - const int fileSize = 23; - const char *restrict const str = "test line 1\ntest line 2"; - buffer = calloc(fileSize + 1, 1); - for (int f = 0; f < fileSize - 1; f ++) - { - REQUIRE(file->read(file, buffer, 1, 1) == 1); - REQUIRE(static_cast<char*>(buffer)[0] == str[f]); - REQUIRE(file->seek(file, 0, SEEK_CUR) == f + 1); - } - REQUIRE(file->read(file, buffer, 1, 1) == 1); - REQUIRE(static_cast<char*>(buffer)[0] == str[22]); - REQUIRE(file->seek(file, 0, SEEK_CUR) == fileSize); - } - - SECTION("test 5") - { - file = VirtFs::rwopsOpenRead("test///test.txt"); - REQUIRE(file != nullptr); - const int fileSize = 23; - const char *restrict const str = "test line 1\ntest line 2"; - buffer = calloc(fileSize + 1, 1); - for (int f = 0; f < fileSize - 1; f += 2) - { - REQUIRE(file->read(file, buffer, 2, 1) == 1); - REQUIRE(static_cast<char*>(buffer)[0] == str[f]); - REQUIRE(static_cast<char*>(buffer)[1] == str[f + 1]); - REQUIRE(file->seek(file, 0, SEEK_CUR) == f + 2); - } - REQUIRE(file->seek(file, 0, SEEK_CUR) == 22); - REQUIRE(file->read(file, buffer, 2, 1) == 0); - } - - SECTION("test 6") - { - file = VirtFs::rwopsOpenRead("test\\\\test.txt"); - REQUIRE(file != nullptr); - const int fileSize = 23; - const char *restrict const str = "test line 1\ntest line 2"; - buffer = calloc(fileSize + 1, 1); - for (int f = 0; f < fileSize - 1; f += 2) - { - REQUIRE(file->read(file, buffer, 1, 2) == 2); - REQUIRE(static_cast<char*>(buffer)[0] == str[f]); - REQUIRE(static_cast<char*>(buffer)[1] == str[f + 1]); - REQUIRE(file->seek(file, 0, SEEK_CUR) == f + 2); - } - REQUIRE(file->seek(file, 0, SEEK_CUR) == 22); - REQUIRE(file->read(file, buffer, 1, 2) == 1); - REQUIRE(static_cast<char*>(buffer)[0] == str[22]); - } - - SECTION("test 7") - { - file = VirtFs::rwopsOpenRead("test//test.txt"); - REQUIRE(file != nullptr); - const int fileSize = 23; - const char *restrict const str = "test line 1\ntest line 2"; - buffer = calloc(fileSize + 1, 1); - for (int f = 0; f < fileSize - 1; f += 2) - { - REQUIRE(file->read(file, buffer, 1, 2) == 2); - REQUIRE(file->seek(file, -2, SEEK_CUR) == f); - REQUIRE(file->seek(file, 0, SEEK_CUR) == f); - REQUIRE(file->seek(file, 2, SEEK_CUR) == f + 2); - REQUIRE(static_cast<char*>(buffer)[0] == str[f]); - REQUIRE(static_cast<char*>(buffer)[1] == str[f + 1]); - REQUIRE(file->seek(file, 0, SEEK_CUR) == f + 2); - } - REQUIRE(file->seek(file, 0, SEEK_CUR) == 22); - REQUIRE(file->read(file, buffer, 1, 2) == 1); - REQUIRE(static_cast<char*>(buffer)[0] == str[22]); - } - - SECTION("test 8") - { - file = VirtFs::rwopsOpenRead("test/test.txt"); - REQUIRE(file != nullptr); - const int fileSize = 23; - const char *restrict const str = "test line 1\ntest line 2"; - buffer = calloc(fileSize + 1, 1); - for (int f = 0; f < fileSize - 1; f += 2) - { - REQUIRE(file->seek(file, -f - 2, SEEK_END) == 23 - f - 2); - REQUIRE(file->read(file, buffer, 1, 2) == 2); - REQUIRE(static_cast<char*>(buffer)[0] == str[23 - f - 2]); - REQUIRE(static_cast<char*>(buffer)[1] == str[23 - f - 2 + 1]); - REQUIRE(file->seek(file, 0, SEEK_CUR) == 23 - f); - } - // 3 - REQUIRE(file->seek(file, 1, SEEK_CUR) == 4); - // 4 - REQUIRE(file->read(file, buffer, 1, 2) == 2); - // 6 - REQUIRE(static_cast<char*>(buffer)[0] == str[4]); - REQUIRE(static_cast<char*>(buffer)[1] == str[5]); - REQUIRE(file->seek(file, -7, SEEK_CUR) == -1); - REQUIRE(file->seek(file, 6, SEEK_SET) == 6); - REQUIRE(file->seek(file, -6, SEEK_CUR) == 0); - } - - if (file != nullptr) - file->close(file); - free(buffer); - VirtFs::unmountDir(prefix + "data"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFs2 getFiles zip1", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip(prefix + "data/test/test2.zip", - Append_false); - - StringVect list; - VirtFs::getFiles("dir", list); - REQUIRE(list.size() == 2); - REQUIRE(inList(list, "dye.png")); - REQUIRE(inList(list, "hide.png")); - - list.clear(); - VirtFs::getFiles("dir2", list); - REQUIRE(list.size() == 4); - REQUIRE(inList(list, "hide.png")); - REQUIRE(inList(list, "paths.xml")); - REQUIRE(inList(list, "test.txt")); - REQUIRE(inList(list, "units.xml")); - - VirtFs::unmountZip(prefix + "data/test/test2.zip"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFs2 getFiles zip2", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip2(prefix + "data/test/test2.zip", - "dir", - Append_false); - - StringVect list; - VirtFs::getFiles(dirSeparator, list); - REQUIRE(list.size() == 2); - REQUIRE(inList(list, "dye.png")); - REQUIRE(inList(list, "hide.png")); - - list.clear(); - VirtFs::getFiles("1", list); - REQUIRE(list.size() == 2); - REQUIRE(inList(list, "file1.txt")); - REQUIRE(inList(list, "test.txt")); - - VirtFs::unmountZip2(prefix + "data/test/test2.zip", - "dir"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFs2 getDirs1", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip(prefix + "data/test/test2.zip", - Append_false); - - StringVect list; - VirtFs::getDirs("dir", list); - REQUIRE(list.size() == 2); - REQUIRE(inList(list, "1")); - REQUIRE(inList(list, "gpl")); - list.clear(); - - VirtFs::getDirs("dir2", list); - REQUIRE(list.empty()); - - VirtFs::unmountZip(prefix + "data/test/test2.zip"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFs2 getDirs2", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - StringVect list; - - SECTION("dir1") - { - VirtFs::mountDir(prefix + "data/test", - Append_false); - - VirtFs::getDirs("/", list); -// REQUIRE(list.size() == 2); - REQUIRE(inList(list, "dir1")); - REQUIRE(inList(list, "dir2")); - list.clear(); - - VirtFs::getDirs("dir1", list); - REQUIRE(list.empty()); - - VirtFs::unmountDir(prefix + "data/test"); - } - - SECTION("dir2") - { - VirtFs::mountDir(prefix + "data", - Append_false); - - VirtFs::getDirs("sfx", list); - REQUIRE(inList(list, "system")); - list.clear(); - - VirtFs::getDirs("evol", list); - REQUIRE(list.size() == 2); - REQUIRE(inList(list, "icons")); - REQUIRE(inList(list, "images")); - - VirtFs::unmountDir(prefix + "data"); - } - - VirtFs::deinit(); -} - -TEST_CASE("VirtFs2 getDirs3", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip2(prefix + "data/test/test2.zip", - "dir", - Append_false); - - StringVect list; - VirtFs::getDirs(dirSeparator, list); - REQUIRE(list.size() == 2); - REQUIRE(inList(list, "1")); - REQUIRE(inList(list, "gpl")); - list.clear(); - - VirtFs::getDirs("1", list); - REQUIRE(list.empty()); - - VirtFs::unmountZip2(prefix + "data/test/test2.zip", - "dir"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFs2 getDirs4", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - StringVect list; - - SECTION("dir1") - { - VirtFs::mountDir2(prefix + "data", - "test", - Append_false); - - VirtFs::getDirs("/", list); - REQUIRE(inList(list, "dir1")); - REQUIRE(inList(list, "dir2")); - list.clear(); - - VirtFs::getDirs("dir1", list); - REQUIRE(list.empty()); - - VirtFs::unmountDir2(prefix + "data", - "test"); - } - - VirtFs::deinit(); -} - -TEST_CASE("VirtFs2 getFilesWithDir1", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip(prefix + "data/test/test2.zip", - Append_false); - - StringVect list; - VirtFs::getFilesWithDir("dir", list); - REQUIRE(list.size() == 2); - REQUIRE(inList(list, "dir", "dye.png")); - REQUIRE(inList(list, "dir", "hide.png")); - list.clear(); - - VirtFs::getFilesWithDir("dir2", list); - REQUIRE(list.size() == 4); - REQUIRE(inList(list, "dir2", "hide.png")); - REQUIRE(inList(list, "dir2", "paths.xml")); - REQUIRE(inList(list, "dir2", "test.txt")); - REQUIRE(inList(list, "dir2", "units.xml")); - list.clear(); - - VirtFs::getFilesWithDir(dirSeparator, list); - REQUIRE(list.size() > 2); - REQUIRE(inList(list, dirSeparator, "test.txt")); - REQUIRE(inList(list, dirSeparator, "units.xml")); - list.clear(); - - VirtFs::unmountZip(prefix + "data/test/test2.zip"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFs2 getFilesWithDir2", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - StringVect list; - - SECTION("dir1") - { - VirtFs::mountDir(prefix + "data/graphics", - Append_false); - - VirtFs::getFilesWithDir("/", list); - REQUIRE(list.size() <= 5); - VirtFs::unmountDir(prefix + "data/graphics"); - } - - SECTION("dir2") - { - VirtFs::mountDir(prefix + "data", - Append_false); - - VirtFs::getFilesWithDir("music", list); - REQUIRE(list.size() <= 5); - REQUIRE(!list.empty()); - REQUIRE(inList(list, "music", "keprohm.ogg")); - list.clear(); - - VirtFs::getFilesWithDir(pathJoin("evol", "icons"), list); -#ifdef WIN32 - REQUIRE(list.size() == 1); - REQUIRE(inList(list, pathJoin("evol", "icons"), "evol-client.ico")); -#else // WIN32 - - REQUIRE(list.size() == 3); - REQUIRE(inList(list, pathJoin("evol", "icons"), "evol-client.ico")); - REQUIRE(inList(list, pathJoin("evol", "icons"), "evol-client.png")); - REQUIRE(inList(list, pathJoin("evol", "icons"), "evol-client.xpm")); -#endif // WIN32 - - VirtFs::unmountDir(prefix + "data"); - } - - VirtFs::deinit(); -} - -TEST_CASE("VirtFs2 getFilesWithDir3", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - - VirtFs::mountZip2(prefix + "data/test/test2.zip", - "dir", - Append_false); - - StringVect list; - VirtFs::getFilesWithDir("1", list); - REQUIRE(list.size() == 2); - REQUIRE(inList(list, "1", "file1.txt")); - REQUIRE(inList(list, "1", "test.txt")); - list.clear(); - - VirtFs::getFilesWithDir(dirSeparator, list); - REQUIRE(list.size() == 2); - REQUIRE(inList(list, dirSeparator, "dye.png")); - REQUIRE(inList(list, dirSeparator, "hide.png")); - list.clear(); - - VirtFs::unmountZip2(prefix + "data/test/test2.zip", - "dir"); - VirtFs::deinit(); -} - -TEST_CASE("VirtFs2 getFilesWithDir4", "") -{ - VirtFs::init("."); - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../" + prefix; - StringVect list; - - SECTION("dir1") - { - VirtFs::mountDir2(prefix + "data/graphics", - "sprites", - Append_false); - - VirtFs::getFilesWithDir("/", list); - REQUIRE(list.size() <= 16); - VirtFs::unmountDir2(prefix + "data/graphics", - "sprites"); - } - - SECTION("dir2") - { - VirtFs::mountDir2(prefix + "data", - "test", - Append_false); - - VirtFs::getFilesWithDir("dir1", list); - REQUIRE(list.size() <= 6); - REQUIRE(!list.empty()); - REQUIRE(inList(list, "dir1", "file1.txt")); - list.clear(); - - VirtFs::unmountDir2(prefix + "data", - "test"); - } - - VirtFs::deinit(); -} diff --git a/src/unittests/fs/virtfs/zip.cc b/src/unittests/fs/virtfs/zip.cc deleted file mode 100644 index 17491835e..000000000 --- a/src/unittests/fs/virtfs/zip.cc +++ /dev/null @@ -1,283 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2017 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#include "unittests/unittests.h" - -#include "logger.h" - -#include "fs/files.h" - -#include "fs/virtfs/fszip.h" -#include "fs/virtfs/zipentry.h" -#include "fs/virtfs/zipreader.h" -#include "fs/virtfs/ziplocalheader.h" - -#include "debug.h" - -extern const char *dirSeparator; - -TEST_CASE("Zip readArchiveInfo", "") -{ - std::string name("data/test/test.zip"); - std::string prefix; - const std::string sep = dirSeparator; - if (Files::existsLocal(name) == false) - prefix = "../"; - - SECTION("test.zip") - { - name = prefix + "data/test/test.zip"; - - VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name, - dirSeparator, - VirtFs::FsZip::getFuncs()); - STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; - - REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry)); - REQUIRE(headers.size() == 2); - REQUIRE(entry->root == name); - REQUIRE(headers[0]->fileName == "dir" + sep + "hide.png"); - REQUIRE(headers[0]->compressSize == 365); - REQUIRE(headers[0]->uncompressSize == 368); - REQUIRE(headers[1]->fileName == "dir" + sep + "brimmedhat.png"); - REQUIRE(headers[1]->compressSize == 1959); - REQUIRE(headers[1]->uncompressSize == 1959); - - delete entry; - } - - SECTION("test2.zip") - { - name = prefix + "data/test/test2.zip"; - - VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name, - dirSeparator, - VirtFs::FsZip::getFuncs()); - STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; - - REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry)); - REQUIRE(headers.size() == 11); - REQUIRE(entry->root == name); - REQUIRE(headers[0]->fileName == "test.txt"); - REQUIRE(headers[0]->compressSize == 17); - REQUIRE(headers[0]->uncompressSize == 23); - - REQUIRE(headers[1]->fileName == "dir2" + sep + "hide.png"); - REQUIRE(headers[1]->compressSize == 365); - REQUIRE(headers[1]->uncompressSize == 368); - - REQUIRE(headers[2]->fileName == "dir2" + sep + "test.txt"); - REQUIRE(headers[2]->compressSize == 17); - REQUIRE(headers[2]->uncompressSize == 23); - - REQUIRE(headers[3]->fileName == "dir2" + sep + "paths.xml"); - REQUIRE(headers[3]->compressSize == 154); - REQUIRE(headers[3]->uncompressSize == 185); - - REQUIRE(headers[4]->fileName == "dir2" + sep + "units.xml"); - REQUIRE(headers[4]->compressSize == 202); - REQUIRE(headers[4]->uncompressSize == 306); - - REQUIRE(headers[5]->fileName == "dir" + sep + "hide.png"); - REQUIRE(headers[5]->compressSize == 365); - REQUIRE(headers[5]->uncompressSize == 368); - - REQUIRE(headers[6]->fileName == - "dir" + sep + "1" + sep + "test.txt"); - REQUIRE(headers[6]->compressSize == 17); - REQUIRE(headers[6]->uncompressSize == 23); - - REQUIRE(headers[7]->fileName == - "dir" + sep + "1" + sep + "file1.txt"); - REQUIRE(headers[7]->compressSize == 17); - REQUIRE(headers[7]->uncompressSize == 23); - - REQUIRE(headers[8]->fileName == - "dir" + sep + "gpl" + sep + "palette.gpl"); - REQUIRE(headers[8]->compressSize == 128); - REQUIRE(headers[8]->uncompressSize == 213); - - REQUIRE(headers[9]->fileName == - "dir" + sep + "dye.png"); - REQUIRE(headers[9]->compressSize == 794); - REQUIRE(headers[9]->uncompressSize == 794); - - REQUIRE(headers[10]->fileName == "units.xml"); - REQUIRE(headers[10]->compressSize == 202); - REQUIRE(headers[10]->uncompressSize == 306); - - delete entry; - } - - SECTION("test3.zip") - { - name = prefix + "data/test/test3.zip"; - - VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name, - dirSeparator, - VirtFs::FsZip::getFuncs()); - STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; - - REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry)); - REQUIRE(headers.size() == 2); - REQUIRE(entry->root == name); - REQUIRE(headers[0]->fileName == "test.txt"); - REQUIRE(headers[0]->compressSize == 17); - REQUIRE(headers[0]->uncompressSize == 23); - REQUIRE(headers[1]->fileName == "units.xml"); - REQUIRE(headers[1]->compressSize == 202); - REQUIRE(headers[1]->uncompressSize == 306); - - delete entry; - } - - SECTION("test4.zip") - { - name = prefix + "data/test/test4.zip"; - - VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name, - dirSeparator, - VirtFs::FsZip::getFuncs()); - STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; - - REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry)); - REQUIRE(entry->root == name); - REQUIRE(headers.empty()); - - delete entry; - } -} - -TEST_CASE("Zip readCompressedFile", "") -{ - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../"; - - SECTION("test2.zip") - { - name = prefix + "data/test/test2.zip"; - - VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name, - dirSeparator, - VirtFs::FsZip::getFuncs()); - STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; - - REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry)); - REQUIRE(headers.size() == 11); - REQUIRE(entry->root == name); - // test.txt - uint8_t *const buf = VirtFs::ZipReader::readCompressedFile(headers[0]); - REQUIRE(buf != nullptr); - delete [] buf; - delete entry; - } -} - -TEST_CASE("Zip readFile", "") -{ - std::string name("data/test/test.zip"); - std::string prefix; - if (Files::existsLocal(name) == false) - prefix = "../"; - - SECTION("test.zip") - { - name = prefix + "data/test/test.zip"; - - VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name, - dirSeparator, - VirtFs::FsZip::getFuncs()); - STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; - - REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry)); - REQUIRE(headers.size() == 2); - REQUIRE(entry->root == name); - for (int f = 0; f < 2; f ++) - { - logger->log("test header: %s, %u, %u", - headers[f]->fileName.c_str(), - headers[f]->compressSize, - headers[f]->uncompressSize); - const uint8_t *const buf = VirtFs::ZipReader::readFile(headers[f]); - REQUIRE(buf != nullptr); - delete [] buf; - } - delete entry; - } - - SECTION("test2.zip") - { - name = prefix + "data/test/test2.zip"; - - VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name, - dirSeparator, - VirtFs::FsZip::getFuncs()); - STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; - - REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry)); - REQUIRE(headers.size() == 11); - REQUIRE(entry->root == name); - // test.txt - const uint8_t *buf = VirtFs::ZipReader::readFile(headers[0]); - REQUIRE(buf != nullptr); - const std::string str = std::string(reinterpret_cast<const char*>(buf), - headers[0]->uncompressSize); - REQUIRE(str == "test line 1\ntest line 2"); - delete [] buf; - for (int f = 0; f < 11; f ++) - { - logger->log("test header: %s, %u, %u", - headers[f]->fileName.c_str(), - headers[f]->compressSize, - headers[f]->uncompressSize); - buf = VirtFs::ZipReader::readFile(headers[f]); - REQUIRE(buf != nullptr); - delete [] buf; - } - delete entry; - } - - SECTION("test3.zip") - { - name = prefix + "data/test/test3.zip"; - - VirtFs::ZipEntry *const entry = new VirtFs::ZipEntry(name, - dirSeparator, - VirtFs::FsZip::getFuncs()); - STD_VECTOR<VirtFs::ZipLocalHeader*> &headers = entry->mHeaders; - - REQUIRE(VirtFs::ZipReader::readArchiveInfo(entry)); - REQUIRE(headers.size() == 2); - REQUIRE(entry->root == name); - for (int f = 0; f < 2; f ++) - { - logger->log("test header: %s, %u, %u", - headers[f]->fileName.c_str(), - headers[f]->compressSize, - headers[f]->uncompressSize); - const uint8_t *const buf = VirtFs::ZipReader::readFile(headers[f]); - REQUIRE(buf != nullptr); - delete [] buf; - } - delete entry; - } -} |