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/zip_unittest.cc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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

diff --git a/src/fs/virtfs/zip_unittest.cc b/src/fs/virtfs/zip_unittest.cc
index 763bcc2bd..35d4b1f8e 100644
--- a/src/fs/virtfs/zip_unittest.cc
+++ b/src/fs/virtfs/zip_unittest.cc
@@ -51,7 +51,7 @@ TEST_CASE("Zip readArchiveInfo")
 
         REQUIRE(Zip::readArchiveInfo(entry));
         REQUIRE(headers.size() == 2);
-        REQUIRE(entry->mArchiveName == name);
+        REQUIRE(entry->root == name);
         REQUIRE(headers[0]->fileName == "dir/hide.png");
         REQUIRE(headers[0]->compressSize == 365);
         REQUIRE(headers[0]->uncompressSize == 368);
@@ -71,7 +71,7 @@ TEST_CASE("Zip readArchiveInfo")
 
         REQUIRE(Zip::readArchiveInfo(entry));
         REQUIRE(headers.size() == 11);
-        REQUIRE(entry->mArchiveName == name);
+        REQUIRE(entry->root == name);
         REQUIRE(headers[0]->fileName == "test.txt");
         REQUIRE(headers[0]->compressSize == 17);
         REQUIRE(headers[0]->uncompressSize == 23);
@@ -128,7 +128,7 @@ TEST_CASE("Zip readArchiveInfo")
 
         REQUIRE(Zip::readArchiveInfo(entry));
         REQUIRE(headers.size() == 2);
-        REQUIRE(entry->mArchiveName == name);
+        REQUIRE(entry->root == name);
         REQUIRE(headers[0]->fileName == "test.txt");
         REQUIRE(headers[0]->compressSize == 17);
         REQUIRE(headers[0]->uncompressSize == 23);
@@ -147,7 +147,7 @@ TEST_CASE("Zip readArchiveInfo")
         std::vector<ZipLocalHeader*> &headers = entry->mHeaders;
 
         REQUIRE(Zip::readArchiveInfo(entry));
-        REQUIRE(entry->mArchiveName == name);
+        REQUIRE(entry->root == name);
         REQUIRE(headers.size() == 0);
 
         delete entry;
@@ -178,7 +178,7 @@ TEST_CASE("Zip readCompressedFile")
 
         REQUIRE(Zip::readArchiveInfo(entry));
         REQUIRE(headers.size() == 11);
-        REQUIRE(entry->mArchiveName == name);
+        REQUIRE(entry->root == name);
         // test.txt
         uint8_t *const buf = Zip::readCompressedFile(headers[0]);
         REQUIRE(buf != nullptr);
@@ -211,7 +211,7 @@ TEST_CASE("Zip readFile")
 
         REQUIRE(Zip::readArchiveInfo(entry));
         REQUIRE(headers.size() == 2);
-        REQUIRE(entry->mArchiveName == name);
+        REQUIRE(entry->root == name);
         for (int f = 0; f < 2; f ++)
         {
             logger->log("test header: %s, %u, %u",
@@ -234,7 +234,7 @@ TEST_CASE("Zip readFile")
 
         REQUIRE(Zip::readArchiveInfo(entry));
         REQUIRE(headers.size() == 11);
-        REQUIRE(entry->mArchiveName == name);
+        REQUIRE(entry->root == name);
         // test.txt
         uint8_t *buf = Zip::readFile(headers[0]);
         REQUIRE(buf != nullptr);
@@ -264,7 +264,7 @@ TEST_CASE("Zip readFile")
 
         REQUIRE(Zip::readArchiveInfo(entry));
         REQUIRE(headers.size() == 2);
-        REQUIRE(entry->mArchiveName == name);
+        REQUIRE(entry->root == name);
         for (int f = 0; f < 2; f ++)
         {
             logger->log("test header: %s, %u, %u",
-- 
cgit v1.2.3-70-g09d2