diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-03-02 04:28:19 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-03-02 04:55:18 +0300 |
| commit | 4b1ca08f26152fbcfb5eb838d271fdd88c381eca (patch) | |
| tree | a005f6414ead9ae4ee287e6d198bab68ad6bdf63 /src/fs/virtfs/virtfszip_unittest.cc | |
| parent | ce9dd5dfa8e49e5204f25e079c1283ab6173b7cb (diff) | |
| download | manaplus-4b1ca08f26152fbcfb5eb838d271fdd88c381eca.tar.gz manaplus-4b1ca08f26152fbcfb5eb838d271fdd88c381eca.tar.bz2 manaplus-4b1ca08f26152fbcfb5eb838d271fdd88c381eca.tar.xz manaplus-4b1ca08f26152fbcfb5eb838d271fdd88c381eca.zip | |
Add base class for VirtDirEntry and VirtZipEntry.
Diffstat (limited to 'src/fs/virtfs/virtfszip_unittest.cc')
| -rw-r--r-- | src/fs/virtfs/virtfszip_unittest.cc | 38 |
1 files changed, 19 insertions, 19 deletions
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"); } |