From c7b2d6baf29cd2a248e2d8dc09f7916643845f97 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 6 Mar 2017 18:08:27 +0300 Subject: Add support for standard library file api in virtfs. Because posix file api broken in mingw. --- src/fs/virtfs/virtfs_unittest.cc | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/fs/virtfs/virtfs_unittest.cc') diff --git a/src/fs/virtfs/virtfs_unittest.cc b/src/fs/virtfs/virtfs_unittest.cc index 7e23227b9..cece63a04 100644 --- a/src/fs/virtfs/virtfs_unittest.cc +++ b/src/fs/virtfs/virtfs_unittest.cc @@ -1267,17 +1267,17 @@ TEST_CASE("VirtFs1 read1") REQUIRE(strcmp(static_cast(buffer), "test line 1\ntest line 2") == 0); REQUIRE(VirtFs::tell(file) == fileSize); - REQUIRE(VirtFs::eof(file) == true); + REQUIRE(VirtFs::eof(file) != 0); free(buffer); buffer = calloc(fileSize + 1, 1); REQUIRE(VirtFs::seek(file, 12) != 0); - REQUIRE(VirtFs::eof(file) == false); + REQUIRE(VirtFs::eof(file) == 0); REQUIRE(VirtFs::tell(file) == 12); REQUIRE(VirtFs::read(file, buffer, 1, 11) == 11); REQUIRE(strcmp(static_cast(buffer), "test line 2") == 0); - REQUIRE(VirtFs::eof(file) == true); + REQUIRE(VirtFs::eof(file) != 0); VirtFs::close(file); free(buffer); @@ -1313,7 +1313,7 @@ TEST_CASE("VirtFs1 read2") REQUIRE(strcmp(static_cast(buffer), "test line 1\ntest line 2") == 0); REQUIRE(VirtFs::tell(file) == fileSize); - REQUIRE(VirtFs::eof(file) == true); + REQUIRE(VirtFs::eof(file) != 0); } SECTION("test 2") @@ -1325,12 +1325,12 @@ TEST_CASE("VirtFs1 read2") buffer = calloc(fileSize + 1, 1); REQUIRE(VirtFs::seek(file, 12) != 0); - REQUIRE(VirtFs::eof(file) == false); + REQUIRE(VirtFs::eof(file) == 0); REQUIRE(VirtFs::tell(file) == 12); REQUIRE(VirtFs::read(file, buffer, 1, 11) == 11); REQUIRE(strcmp(static_cast(buffer), "test line 2") == 0); - REQUIRE(VirtFs::eof(file) == true); + REQUIRE(VirtFs::eof(file) != 0); } SECTION("test 3") @@ -1343,7 +1343,7 @@ TEST_CASE("VirtFs1 read2") for (int f = 0; f < fileSize; f ++) { REQUIRE(VirtFs::seek(file, f) != 0); - REQUIRE(VirtFs::eof(file) == false); + REQUIRE(VirtFs::eof(file) == 0); REQUIRE(VirtFs::tell(file) == f); } } @@ -1359,12 +1359,12 @@ TEST_CASE("VirtFs1 read2") { REQUIRE(VirtFs::read(file, buffer, 1, 1) == 1); REQUIRE(static_cast(buffer)[0] == str[f]); - REQUIRE(VirtFs::eof(file) == false); + REQUIRE(VirtFs::eof(file) == 0); REQUIRE(VirtFs::tell(file) == f + 1); } REQUIRE(VirtFs::read(file, buffer, 1, 1) == 1); REQUIRE(static_cast(buffer)[0] == str[22]); - REQUIRE(VirtFs::eof(file) == true); + REQUIRE(VirtFs::eof(file) != 0); REQUIRE(VirtFs::tell(file) == fileSize); } @@ -1380,13 +1380,13 @@ TEST_CASE("VirtFs1 read2") REQUIRE(VirtFs::read(file, buffer, 2, 1) == 1); REQUIRE(static_cast(buffer)[0] == str[f]); REQUIRE(static_cast(buffer)[1] == str[f + 1]); - REQUIRE(VirtFs::eof(file) == false); + REQUIRE(VirtFs::eof(file) == 0); REQUIRE(VirtFs::tell(file) == f + 2); } - REQUIRE(VirtFs::eof(file) == false); + REQUIRE(VirtFs::eof(file) == 0); REQUIRE(VirtFs::tell(file) == 22); REQUIRE(VirtFs::read(file, buffer, 2, 1) == 0); - REQUIRE(VirtFs::eof(file) == false); + REQUIRE(VirtFs::eof(file) == 0); } SECTION("test 6") @@ -1401,14 +1401,14 @@ TEST_CASE("VirtFs1 read2") REQUIRE(VirtFs::read(file, buffer, 1, 2) == 2); REQUIRE(static_cast(buffer)[0] == str[f]); REQUIRE(static_cast(buffer)[1] == str[f + 1]); - REQUIRE(VirtFs::eof(file) == false); + REQUIRE(VirtFs::eof(file) == 0); REQUIRE(VirtFs::tell(file) == f + 2); } - REQUIRE(VirtFs::eof(file) == false); + REQUIRE(VirtFs::eof(file) == 0); REQUIRE(VirtFs::tell(file) == 22); REQUIRE(VirtFs::read(file, buffer, 1, 2) == 1); REQUIRE(static_cast(buffer)[0] == str[22]); - REQUIRE(VirtFs::eof(file) == true); + REQUIRE(VirtFs::eof(file) != 0); } VirtFs::close(file); -- cgit v1.2.3-70-g09d2