diff options
Diffstat (limited to 'src/fs/virtfs/virtfs1_unittest.cc')
| -rw-r--r-- | src/fs/virtfs/virtfs1_unittest.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/fs/virtfs/virtfs1_unittest.cc b/src/fs/virtfs/virtfs1_unittest.cc index b1084d605..8a219e3ce 100644 --- a/src/fs/virtfs/virtfs1_unittest.cc +++ b/src/fs/virtfs/virtfs1_unittest.cc @@ -25,7 +25,7 @@ #include "fs/virtfs/direntry.h" #include "fs/virtfs/fs.h" #include "fs/virtfs/rwops.h" -#include "fs/virtfs/virtlist.h" +#include "fs/virtfs/list.h" #include "utils/checkutils.h" #include "utils/delete2.h" @@ -673,7 +673,7 @@ TEST_CASE("VirtFs1 getRealDir2") delete2(logger); } -static bool inList(const VirtFs::VirtList *const list, +static bool inList(const VirtFs::List *const list, const std::string &name) { FOR_EACH (StringVectCIter, it, list->names) @@ -718,7 +718,7 @@ TEST_CASE("VirtFs1 enumerateFiles1") VirtFs::mountDirSilent("../data", Append_false); - VirtFs::VirtList *list = nullptr; + VirtFs::List *list = nullptr; const int cnt1 = VirtFs::exists("test/test2.txt") ? 28 : 27; const int cnt2 = 28; @@ -763,7 +763,7 @@ TEST_CASE("VirtFs1 enumerateFiles2") VirtFs::mountDirSilent("../data/test/dir1", Append_false); - VirtFs::VirtList *list = nullptr; + VirtFs::List *list = nullptr; list = VirtFs::enumerateFiles("/"); REQUIRE(list->names.size() == 5); @@ -788,7 +788,7 @@ TEST_CASE("VirtFs1 enumerateFiles3") VirtFs::mountDirSilent("../data/test/dir2", Append_false); - VirtFs::VirtList *list = nullptr; + VirtFs::List *list = nullptr; list = VirtFs::enumerateFiles("/"); const size_t sz = list->names.size(); @@ -811,7 +811,7 @@ TEST_CASE("VirtFsZip enumerateFiles4") VirtFs::mountZip(prefix + "test.zip", Append_false); - VirtFs::VirtList *list = nullptr; + VirtFs::List *list = nullptr; list = VirtFs::enumerateFiles("dir"); REQUIRE(list->names.size() == 2); @@ -838,7 +838,7 @@ TEST_CASE("VirtFsZip enumerateFiles5") VirtFs::mountZip(prefix + "test2.zip", Append_true); - VirtFs::VirtList *list = nullptr; + VirtFs::List *list = nullptr; list = VirtFs::enumerateFiles("dir"); FOR_EACH (StringVectCIter, it, list->names) @@ -872,7 +872,7 @@ TEST_CASE("VirtFsZip enumerateFiles6") VirtFs::mountZip(prefix + "test.zip", Append_false); - VirtFs::VirtList *list = nullptr; + VirtFs::List *list = nullptr; list = VirtFs::enumerateFiles("/"); REQUIRE(list->names.size() == 1); @@ -896,7 +896,7 @@ TEST_CASE("VirtFsZip enumerateFiles7") VirtFs::mountZip(prefix + "test2.zip", Append_false); - VirtFs::VirtList *list = nullptr; + VirtFs::List *list = nullptr; list = VirtFs::enumerateFiles("/"); REQUIRE(list->names.size() == 4); @@ -925,7 +925,7 @@ TEST_CASE("VirtFsZip enumerateFiles8") VirtFs::mountDirSilent(prefix + "data/test", Append_false); - VirtFs::VirtList *list = nullptr; + VirtFs::List *list = nullptr; list = VirtFs::enumerateFiles("dir2"); REQUIRE(list->names.size() >= 6); @@ -957,7 +957,7 @@ TEST_CASE("VirtFsZip enumerateFiles9") VirtFs::mountDirSilent(prefix + "data/test", Append_false); - VirtFs::VirtList *list = nullptr; + VirtFs::List *list = nullptr; list = VirtFs::enumerateFiles("dir"); REQUIRE(list->names.size() == 4); |