From cfb75b015a4e70843e571ce599e11bf2990abc1b Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 16 May 2017 02:41:29 +0300
Subject: Add subdir support into VirtFs::getRealDir.

---
 src/fs/virtfs/virtfs1_unittest.cc | 50 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

(limited to 'src/fs/virtfs/virtfs1_unittest.cc')

diff --git a/src/fs/virtfs/virtfs1_unittest.cc b/src/fs/virtfs/virtfs1_unittest.cc
index d34af34aa..264f92079 100644
--- a/src/fs/virtfs/virtfs1_unittest.cc
+++ b/src/fs/virtfs/virtfs1_unittest.cc
@@ -1404,6 +1404,56 @@ TEST_CASE("VirtFs1 getRealDir2")
     delete2(logger);
 }
 
+TEST_CASE("VirtFs1 getRealDir3")
+{
+    VirtFs::init(".");
+    logger = new Logger();
+    const std::string sep = dirSeparator;
+    REQUIRE(VirtFs::getRealDir(".") == "");
+    REQUIRE(VirtFs::getRealDir("..") == "");
+    const bool dir1 = VirtFs::mountDirSilent2("data",
+        "test",
+        Append_false);
+    REQUIRE((dir1 || VirtFs::mountDirSilent2("../data",
+        "test",
+        Append_false)) == true);
+    REQUIRE(VirtFs::getRealDir("file1.txt") == "");
+    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") == "");
+
+    VirtFs::mountDirSilent2("data/test",
+        "dir2",
+        Append_false);
+    VirtFs::mountDirSilent2("../data/test",
+        "dir2",
+        Append_false);
+    REQUIRE(VirtFs::getRealDir("dir") == "");
+    if (dir1 == true)
+    {
+        REQUIRE(VirtFs::getRealDir("file1.txt") == "data");
+        REQUIRE(VirtFs::getRealDir("simplefile.txt") == "data" + sep + "test");
+    }
+    else
+    {
+        REQUIRE(VirtFs::getRealDir("file1.txt") ==
+            ".." + sep + "data" + sep + "test");
+        REQUIRE(VirtFs::getRealDir("simplefile.txt") == ".." + sep + "data");
+    }
+    REQUIRE(VirtFs::getRealDir("zzz") == "");
+
+    VirtFs::deinit();
+    delete2(logger);
+}
+
 static bool inList(const VirtFs::List *const list,
                    const std::string &name)
 {
-- 
cgit v1.2.3-60-g2f50