Fix compilation without physfs.

Also split fs related files to virtfs and physfs.

1 files changed, 0 insertions, 279 deletions

diff --git a/src/fs/zip_unittest.cc b/src/fs/zip_unittest.cc
deleted file mode 100644
index 44cfb4757..000000000
--- a/src/fs/zip_unittest.cc
+++ /dev/null
@@ -1,279 +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 "catch.hpp"
-
-#include "logger.h"
-
-#include "fs/files.h"
-#include "fs/virtzipentry.h"
-#include "fs/zip.h"
-#include "fs/ziplocalheader.h"
-
-#include "utils/delete2.h"
-
-#include "debug.h"
-
-TEST_CASE("Zip readArchiveInfo")
-{
-    logger = new Logger();
-    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";
-
-        VirtZipEntry *const entry = new VirtZipEntry(name);
-        std::vector<ZipLocalHeader*> &headers = entry->mHeaders;
-
-        REQUIRE(Zip::readArchiveInfo(entry));
-        REQUIRE(headers.size() == 2);
-        REQUIRE(entry->mArchiveName == name);
-        REQUIRE(headers[0]->fileName == "dir/hide.png");
-        REQUIRE(headers[0]->compressSize == 365);
-        REQUIRE(headers[0]->uncompressSize == 368);
-        REQUIRE(headers[1]->fileName == "dir/brimmedhat.png");
-        REQUIRE(headers[1]->compressSize == 1959);
-        REQUIRE(headers[1]->uncompressSize == 1959);
-
-        delete entry;
-    }
-
-    SECTION("test2.zip")
-    {
-        name = prefix + "data/test/test2.zip";
-
-        VirtZipEntry *const entry = new VirtZipEntry(name);
-        std::vector<ZipLocalHeader*> &headers = entry->mHeaders;
-
-        REQUIRE(Zip::readArchiveInfo(entry));
-        REQUIRE(headers.size() == 11);
-        REQUIRE(entry->mArchiveName == name);
-        REQUIRE(headers[0]->fileName == "test.txt");
-        REQUIRE(headers[0]->compressSize == 17);
-        REQUIRE(headers[0]->uncompressSize == 23);
-
-        REQUIRE(headers[1]->fileName == "dir2/hide.png");
-        REQUIRE(headers[1]->compressSize == 365);
-        REQUIRE(headers[1]->uncompressSize == 368);
-
-        REQUIRE(headers[2]->fileName == "dir2/test.txt");
-        REQUIRE(headers[2]->compressSize == 17);
-        REQUIRE(headers[2]->uncompressSize == 23);
-
-        REQUIRE(headers[3]->fileName == "dir2/paths.xml");
-        REQUIRE(headers[3]->compressSize == 154);
-        REQUIRE(headers[3]->uncompressSize == 185);
-
-        REQUIRE(headers[4]->fileName == "dir2/units.xml");
-        REQUIRE(headers[4]->compressSize == 202);
-        REQUIRE(headers[4]->uncompressSize == 306);
-
-        REQUIRE(headers[5]->fileName == "dir/hide.png");
-        REQUIRE(headers[5]->compressSize == 365);
-        REQUIRE(headers[5]->uncompressSize == 368);
-
-        REQUIRE(headers[6]->fileName == "dir/1/test.txt");
-        REQUIRE(headers[6]->compressSize == 17);
-        REQUIRE(headers[6]->uncompressSize == 23);
-
-        REQUIRE(headers[7]->fileName == "dir/1/file1.txt");
-        REQUIRE(headers[7]->compressSize == 17);
-        REQUIRE(headers[7]->uncompressSize == 23);
-
-        REQUIRE(headers[8]->fileName == "dir/gpl/palette.gpl");
-        REQUIRE(headers[8]->compressSize == 128);
-        REQUIRE(headers[8]->uncompressSize == 213);
-
-        REQUIRE(headers[9]->fileName == "dir/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";
-
-        VirtZipEntry *const entry = new VirtZipEntry(name);
-        std::vector<ZipLocalHeader*> &headers = entry->mHeaders;
-
-        REQUIRE(Zip::readArchiveInfo(entry));
-        REQUIRE(headers.size() == 2);
-        REQUIRE(entry->mArchiveName == 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";
-
-        VirtZipEntry *const entry = new VirtZipEntry(name);
-        std::vector<ZipLocalHeader*> &headers = entry->mHeaders;
-
-        REQUIRE(Zip::readArchiveInfo(entry));
-        REQUIRE(entry->mArchiveName == name);
-        REQUIRE(headers.size() == 0);
-
-        delete entry;
-    }
-
-    delete2(logger);
-}
-
-TEST_CASE("Zip readCompressedFile")
-{
-    logger = new Logger();
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../";
-
-    SECTION("empty")
-    {
-        REQUIRE_THROWS(Zip::readCompressedFile(nullptr));
-    }
-
-    SECTION("test2.zip")
-    {
-        name = prefix + "data/test/test2.zip";
-
-        VirtZipEntry *const entry = new VirtZipEntry(name);
-        std::vector<ZipLocalHeader*> &headers = entry->mHeaders;
-
-        REQUIRE(Zip::readArchiveInfo(entry));
-        REQUIRE(headers.size() == 11);
-        REQUIRE(entry->mArchiveName == name);
-        // test.txt
-        uint8_t *const buf = Zip::readCompressedFile(headers[0]);
-        REQUIRE(buf != nullptr);
-        delete [] buf;
-        delete entry;
-    }
-
-    delete2(logger);
-}
-
-TEST_CASE("Zip readFile")
-{
-    logger = new Logger();
-    std::string name("data/test/test.zip");
-    std::string prefix;
-    if (Files::existsLocal(name) == false)
-        prefix = "../";
-
-    SECTION("empty")
-    {
-        REQUIRE_THROWS(Zip::readFile(nullptr));
-    }
-
-    SECTION("test.zip")
-    {
-        name = prefix + "data/test/test.zip";
-
-        VirtZipEntry *const entry = new VirtZipEntry(name);
-        std::vector<ZipLocalHeader*> &headers = entry->mHeaders;
-
-        REQUIRE(Zip::readArchiveInfo(entry));
-        REQUIRE(headers.size() == 2);
-        REQUIRE(entry->mArchiveName == 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);
-            uint8_t *const buf = Zip::readFile(headers[f]);
-            REQUIRE(buf != nullptr);
-            delete [] buf;
-        }
-        delete entry;
-    }
-
-    SECTION("test2.zip")
-    {
-        name = prefix + "data/test/test2.zip";
-
-        VirtZipEntry *const entry = new VirtZipEntry(name);
-        std::vector<ZipLocalHeader*> &headers = entry->mHeaders;
-
-        REQUIRE(Zip::readArchiveInfo(entry));
-        REQUIRE(headers.size() == 11);
-        REQUIRE(entry->mArchiveName == name);
-        // test.txt
-        uint8_t *buf = Zip::readFile(headers[0]);
-        REQUIRE(buf != nullptr);
-        const std::string str = std::string(reinterpret_cast<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 = Zip::readFile(headers[f]);
-            REQUIRE(buf != nullptr);
-            delete [] buf;
-        }
-        delete entry;
-    }
-
-    SECTION("test3.zip")
-    {
-        name = prefix + "data/test/test3.zip";
-
-        VirtZipEntry *const entry = new VirtZipEntry(name);
-        std::vector<ZipLocalHeader*> &headers = entry->mHeaders;
-
-        REQUIRE(Zip::readArchiveInfo(entry));
-        REQUIRE(headers.size() == 2);
-        REQUIRE(entry->mArchiveName == 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);
-            uint8_t *const buf = Zip::readFile(headers[f]);
-            REQUIRE(buf != nullptr);
-            delete [] buf;
-        }
-        delete entry;
-    }
-
-    delete2(logger);
-}