Split unit tests for mount dir and mount zip into separate files.

5 files changed, 374 insertions, 287 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index d46a76cad..7f22f0507 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2091,8 +2091,10 @@ manaplustests_SOURCES += \
 	      unittests/fs/virtfs/virtfs1_enumerate.cc \
 	      unittests/fs/virtfs/virtfs1_exists.cc \
 	      unittests/fs/virtfs/virtfs1_getrealdir.cc \
-	      unittests/fs/virtfs/virtfs1_mountdir.cc \
-	      unittests/fs/virtfs/virtfs1_mountzip.cc \
+	      unittests/fs/virtfs/virtfs1_mountdir1.cc \
+	      unittests/fs/virtfs/virtfs1_mountdir2.cc \
+	      unittests/fs/virtfs/virtfs1_mountzip1.cc \
+	      unittests/fs/virtfs/virtfs1_mountzip2.cc \
 	      unittests/fs/virtfs/virtfs1_unmount.cc \
 	      unittests/fs/virtfs/virtfs2.cc \
 	      unittests/fs/virtfs/zip.cc \
diff --git a/src/unittests/fs/virtfs/virtfs1_mountdir1.cc b/src/unittests/fs/virtfs/virtfs1_mountdir1.cc
new file mode 100644
index 000000000..92d6d037d
--- /dev/null
+++ b/src/unittests/fs/virtfs/virtfs1_mountdir1.cc
@@ -0,0 +1,195 @@
+/*
+ *  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_mountdir.cc b/src/unittests/fs/virtfs/virtfs1_mountdir2.cc
index a4a9dd648..35900389f 100644
--- a/src/unittests/fs/virtfs/virtfs1_mountdir.cc
+++ b/src/unittests/fs/virtfs/virtfs1_mountdir2.cc
@@ -31,166 +31,10 @@
 
 #include "debug.h"
 
-TEST_CASE("VirtFs1 mountDir", "")
+TEST_CASE("VirtFs1 mountDir2", "")
 {
     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");
-    }
-
     SECTION("subDir 1")
     {
         REQUIRE(VirtFs::mountDirSilentTest2("dir1",
diff --git a/src/unittests/fs/virtfs/virtfs1_mountzip1.cc b/src/unittests/fs/virtfs/virtfs1_mountzip1.cc
new file mode 100644
index 000000000..09932f0a6
--- /dev/null
+++ b/src/unittests/fs/virtfs/virtfs1_mountzip1.cc
@@ -0,0 +1,173 @@
+/*
+ *  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_mountzip.cc b/src/unittests/fs/virtfs/virtfs1_mountzip2.cc
index 5cd0cda17..c9415e007 100644
--- a/src/unittests/fs/virtfs/virtfs1_mountzip.cc
+++ b/src/unittests/fs/virtfs/virtfs1_mountzip2.cc
@@ -33,7 +33,7 @@
 
 #include "debug.h"
 
-TEST_CASE("VirtFs1 mountZip", "")
+TEST_CASE("VirtFs1 mountZip2", "")
 {
     VirtFs::init(".");
     std::string name("data/test/test.zip");
@@ -42,133 +42,6 @@ TEST_CASE("VirtFs1 mountZip", "")
     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());
-    }
-
     SECTION("subDir 1")
     {
         REQUIRE(VirtFs::mountZip2(prefix + "data/test/test.zip",