From 4b1ca08f26152fbcfb5eb838d271fdd88c381eca Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Thu, 2 Mar 2017 04:28:19 +0300
Subject: Add base class for VirtDirEntry and VirtZipEntry.

---
 src/fs/virtfs/virtfszip_unittest.cc | 38 ++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

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

diff --git a/src/fs/virtfs/virtfszip_unittest.cc b/src/fs/virtfs/virtfszip_unittest.cc
index 59974e32e..9a3f9a491 100644
--- a/src/fs/virtfs/virtfszip_unittest.cc
+++ b/src/fs/virtfs/virtfszip_unittest.cc
@@ -60,7 +60,7 @@ TEST_CASE("VirtFsZip addToSearchPath")
         REQUIRE(VirtFsZip::searchEntryByArchive(
             prefix + "file2.zip") == nullptr);
         REQUIRE(VirtFsZip::getEntries().size() == 1);
-        REQUIRE(VirtFsZip::getEntries()[0]->mArchiveName ==
+        REQUIRE(VirtFsZip::getEntries()[0]->root ==
             prefix + "test.zip");
     }
 
@@ -73,7 +73,7 @@ TEST_CASE("VirtFsZip addToSearchPath")
         REQUIRE(VirtFsZip::searchEntryByArchive(
             prefix + "file2.zip") == nullptr);
         REQUIRE(VirtFsZip::getEntries().size() == 1);
-        REQUIRE(VirtFsZip::getEntries()[0]->mArchiveName ==
+        REQUIRE(VirtFsZip::getEntries()[0]->root ==
             prefix + "test.zip");
     }
 
@@ -90,9 +90,9 @@ TEST_CASE("VirtFsZip addToSearchPath")
         REQUIRE(VirtFsZip::searchEntryByArchive(
             prefix + "test3.zip") == nullptr);
         REQUIRE(VirtFsZip::getEntries().size() == 2);
-        REQUIRE(VirtFsZip::getEntries()[0]->mArchiveName ==
+        REQUIRE(VirtFsZip::getEntries()[0]->root ==
             prefix + "test2.zip");
-        REQUIRE(VirtFsZip::getEntries()[1]->mArchiveName ==
+        REQUIRE(VirtFsZip::getEntries()[1]->root ==
             prefix + "test.zip");
     }
 
@@ -109,9 +109,9 @@ TEST_CASE("VirtFsZip addToSearchPath")
         REQUIRE(VirtFsZip::searchEntryByArchive(
             prefix + "test3.zip") == nullptr);
         REQUIRE(VirtFsZip::getEntries().size() == 2);
-        REQUIRE(VirtFsZip::getEntries()[0]->mArchiveName ==
+        REQUIRE(VirtFsZip::getEntries()[0]->root ==
             prefix + "test.zip");
-        REQUIRE(VirtFsZip::getEntries()[1]->mArchiveName ==
+        REQUIRE(VirtFsZip::getEntries()[1]->root ==
             prefix + "test2.zip");
     }
 
@@ -132,11 +132,11 @@ TEST_CASE("VirtFsZip addToSearchPath")
         REQUIRE(VirtFsZip::searchEntryByArchive(
             prefix + "test4.zip") == nullptr);
         REQUIRE(VirtFsZip::getEntries().size() == 3);
-        REQUIRE(VirtFsZip::getEntries()[0]->mArchiveName ==
+        REQUIRE(VirtFsZip::getEntries()[0]->root ==
             prefix + "test.zip");
-        REQUIRE(VirtFsZip::getEntries()[1]->mArchiveName ==
+        REQUIRE(VirtFsZip::getEntries()[1]->root ==
             prefix + "test2.zip");
-        REQUIRE(VirtFsZip::getEntries()[2]->mArchiveName ==
+        REQUIRE(VirtFsZip::getEntries()[2]->root ==
             prefix + "test3.zip");
     }
 
@@ -157,11 +157,11 @@ TEST_CASE("VirtFsZip addToSearchPath")
         REQUIRE(VirtFsZip::searchEntryByArchive(
             prefix + "test4.zip") == nullptr);
         REQUIRE(VirtFsZip::getEntries().size() == 3);
-        REQUIRE(VirtFsZip::getEntries()[0]->mArchiveName ==
+        REQUIRE(VirtFsZip::getEntries()[0]->root ==
             prefix + "test3.zip");
-        REQUIRE(VirtFsZip::getEntries()[1]->mArchiveName ==
+        REQUIRE(VirtFsZip::getEntries()[1]->root ==
             prefix + "test.zip");
-        REQUIRE(VirtFsZip::getEntries()[2]->mArchiveName ==
+        REQUIRE(VirtFsZip::getEntries()[2]->root ==
             prefix + "test2.zip");
     }
 
@@ -205,20 +205,20 @@ TEST_CASE("VirtFsZip removeFromSearchPath")
         REQUIRE_THROWS(VirtFsZip::removeFromSearchPath(prefix + "test4.zip"));
         REQUIRE(VirtFsZip::removeFromSearchPath(prefix + "test.zip"));
         REQUIRE(VirtFsZip::getEntries().size() == 2);
-        REQUIRE(VirtFsZip::getEntries()[0]->mArchiveName ==
+        REQUIRE(VirtFsZip::getEntries()[0]->root ==
             prefix + "test3.zip");
-        REQUIRE(VirtFsZip::getEntries()[1]->mArchiveName ==
+        REQUIRE(VirtFsZip::getEntries()[1]->root ==
             prefix + "test2.zip");
         REQUIRE_THROWS(VirtFsZip::removeFromSearchPath(prefix + "test.zip"));
         REQUIRE(VirtFsZip::getEntries().size() == 2);
-        REQUIRE(VirtFsZip::getEntries()[0]->mArchiveName ==
+        REQUIRE(VirtFsZip::getEntries()[0]->root ==
             prefix + "test3.zip");
-        REQUIRE(VirtFsZip::getEntries()[1]->mArchiveName ==
+        REQUIRE(VirtFsZip::getEntries()[1]->root ==
             prefix + "test2.zip");
         REQUIRE(VirtFsZip::removeFromSearchPath(prefix + "//test2.zip"));
         REQUIRE_THROWS(VirtFsZip::removeFromSearchPath(prefix + "test2.zip"));
         REQUIRE(VirtFsZip::getEntries().size() == 1);
-        REQUIRE(VirtFsZip::getEntries()[0]->mArchiveName ==
+        REQUIRE(VirtFsZip::getEntries()[0]->root ==
             prefix + "test3.zip");
     }
 
@@ -227,7 +227,7 @@ TEST_CASE("VirtFsZip removeFromSearchPath")
         REQUIRE(VirtFsZip::addToSearchPathSilent(prefix + "\\test.zip",
             Append_true));
         REQUIRE(VirtFsZip::getEntries().size() == 1);
-        REQUIRE(VirtFsZip::getEntries()[0]->mArchiveName ==
+        REQUIRE(VirtFsZip::getEntries()[0]->root ==
             prefix + "test.zip");
         REQUIRE_THROWS(VirtFsZip::removeFromSearchPath(prefix + "test2.zip"));
         REQUIRE(VirtFsZip::removeFromSearchPath(prefix + "\\test.zip"));
@@ -235,7 +235,7 @@ TEST_CASE("VirtFsZip removeFromSearchPath")
         REQUIRE(VirtFsZip::addToSearchPathSilent(prefix + "test.zip",
             Append_true));
         REQUIRE(VirtFsZip::getEntries().size() == 1);
-        REQUIRE(VirtFsZip::getEntries()[0]->mArchiveName ==
+        REQUIRE(VirtFsZip::getEntries()[0]->root ==
             prefix + "test.zip");
     }
 
-- 
cgit v1.2.3-70-g09d2