1 files changed, 0 insertions, 405 deletions
diff --git a/src/utils/virtfs_unittest.cc b/src/utils/virtfs_unittest.cc
deleted file mode 100644
index e8af0bb1d..000000000
--- a/src/utils/virtfs_unittest.cc
+++ /dev/null
@@ -1,405 +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 "catch.hpp"
-
-#include "utils/checkutils.h"
-#include "utils/delete2.h"
-#include "utils/virtfs.h"
-#include "utils/virtfstools.h"
-#include "utils/virtlist.h"
-
-#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 exists")
-{
-    logger = new Logger();
-    VirtFs::addDirToSearchPath("data", Append_false);
-    VirtFs::addDirToSearchPath("../data", Append_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::addDirToSearchPath("data/test", Append_false);
-    VirtFs::addDirToSearchPath("../data/test", Append_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::removeDirFromSearchPath("data/test");
-    VirtFs::removeDirFromSearchPath("../data/test");
-
-    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::removeDirFromSearchPath("data");
-    VirtFs::removeDirFromSearchPath("../data");
-    delete2(logger);
-}
-
-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("VirtFs enumerateFiles")
-{
-    logger = new Logger;
-
-    VirtFs::addDirToSearchPath("data", Append_false);
-    VirtFs::addDirToSearchPath("../data", Append_false);
-
-    VirtList *list = nullptr;
-
-    const int cnt1 = VirtFs::exists("test/test2.txt") ? 23 : 22;
-    const int cnt2 = 23;
-
-    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);
-
-    VirtFs::removeDirFromSearchPath("data");
-    VirtFs::removeDirFromSearchPath("../data");
-    delete2(logger);
-}
-
-TEST_CASE("VirtFs isDirectory")
-{
-    logger = new Logger();
-    VirtFs::addDirToSearchPath("data", Append_false);
-    VirtFs::addDirToSearchPath("../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::addDirToSearchPath("data/test", Append_false);
-    VirtFs::addDirToSearchPath("../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::removeDirFromSearchPath("data/test");
-    VirtFs::removeDirFromSearchPath("../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::removeDirFromSearchPath("data");
-    VirtFs::removeDirFromSearchPath("../data");
-    delete2(logger);
-}
-
-TEST_CASE("VirtFs openRead")
-{
-    logger = new Logger();
-    VirtFs::addDirToSearchPath("data", Append_false);
-    VirtFs::addDirToSearchPath("../data", Append_false);
-
-    VirtFile *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::addDirToSearchPath("data/test", Append_false);
-    VirtFs::addDirToSearchPath("../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::removeDirFromSearchPath("data/test");
-    VirtFs::removeDirFromSearchPath("../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::removeDirFromSearchPath("data");
-    VirtFs::removeDirFromSearchPath("../data");
-    delete2(logger);
-}
-
-TEST_CASE("VirtFs addZipToSearchPath")
-{
-    // +++ need implement
-}
-
-TEST_CASE("VirtFs removeZipFromSearchPath")
-{
-    // +++ need implement
-}
-
-TEST_CASE("VirtFs getRealDir")
-{
-    logger = new Logger();
-    REQUIRE(VirtFs::getRealDir(".") == "");
-    REQUIRE(VirtFs::getRealDir("..") == "");
-    const bool dir1 = VirtFs::addDirToSearchPath("data", Append_false);
-    REQUIRE((dir1 || VirtFs::addDirToSearchPath("../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") == "");
-
-    VirtFs::addDirToSearchPath("data/test", Append_false);
-    VirtFs::addDirToSearchPath("../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/test");
-    }
-    else
-    {
-        REQUIRE(VirtFs::getRealDir("test") == "../data");
-        REQUIRE(VirtFs::getRealDir("test/test.txt") ==
-            "../data");
-        REQUIRE(VirtFs::getRealDir("test.txt") ==
-            "../data/test");
-    }
-    REQUIRE(VirtFs::getRealDir("zzz") == "");
-
-    VirtFs::removeDirFromSearchPath("data/test");
-    VirtFs::removeDirFromSearchPath("../data/test");
-
-    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") == "");
-
-    VirtFs::removeDirFromSearchPath("data");
-    VirtFs::removeDirFromSearchPath("../data");
-    delete2(logger);
-}
-
-TEST_CASE("VirtFs permitLinks")
-{
-    logger = new Logger();
-    VirtFs::addDirToSearchPath("data", Append_false);
-    VirtFs::addDirToSearchPath("../data", Append_false);
-
-    const int cnt1 = VirtFs::exists("test/test2.txt") ? 22 : 21;
-    const int cnt2 = 22;
-
-    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::removeDirFromSearchPath("data");
-    VirtFs::removeDirFromSearchPath("../data");
-    delete2(logger);
-}
-
-TEST_CASE("VirtFs read")
-{
-    logger = new Logger();
-    VirtFs::addDirToSearchPath("data", Append_false);
-    VirtFs::addDirToSearchPath("../data", Append_false);
-
-    VirtFile *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::removeDirFromSearchPath("data");
-    VirtFs::removeDirFromSearchPath("../data");
-    delete2(logger);
-}