diff options
author | Tor Egge <Tor.Egge@online.no> | 2023-07-14 19:51:52 +0200 |
---|---|---|
committer | Tor Egge <Tor.Egge@online.no> | 2023-07-14 19:51:52 +0200 |
commit | 2dcef04763b922b8fd5069ed4e4c8d2c1cd36cd4 (patch) | |
tree | 3991928e6f94f92e1e7d07e711a9148ded901db1 | |
parent | 8eb009d276f9ab6b6774d8a4f44575f502def059 (diff) |
Use std::filesystem::remove in unit tests.
-rw-r--r-- | searchcore/src/tests/proton/index/diskindexcleaner_test.cpp | 6 | ||||
-rw-r--r-- | searchcore/src/tests/proton/index/indexmanager_test.cpp | 2 | ||||
-rw-r--r-- | vespalib/src/tests/fileheader/fileheader_test.cpp | 31 |
3 files changed, 23 insertions, 16 deletions
diff --git a/searchcore/src/tests/proton/index/diskindexcleaner_test.cpp b/searchcore/src/tests/proton/index/diskindexcleaner_test.cpp index 35583ea46da..e8926a957b7 100644 --- a/searchcore/src/tests/proton/index/diskindexcleaner_test.cpp +++ b/searchcore/src/tests/proton/index/diskindexcleaner_test.cpp @@ -120,7 +120,7 @@ void Test::requireThatIndexesInUseAreNotRemoved() { void Test::requireThatInvalidFlushIndexesAreRemoved() { createIndexes(); - FastOS_File((index_dir + "/index.flush.4/serial.dat").c_str()).Delete(); + std::filesystem::remove(std::filesystem::path(index_dir + "/index.flush.4/serial.dat")); DiskIndexes disk_indexes; DiskIndexCleaner::clean(index_dir, disk_indexes); vector<string> indexes = readIndexes(); @@ -131,7 +131,7 @@ void Test::requireThatInvalidFlushIndexesAreRemoved() { void Test::requireThatInvalidFusionIndexesAreRemoved() { createIndexes(); - FastOS_File((index_dir + "/index.fusion.2/serial.dat").c_str()).Delete(); + std::filesystem::remove(std::filesystem::path(index_dir + "/index.fusion.2/serial.dat")); DiskIndexes disk_indexes; DiskIndexCleaner::clean(index_dir, disk_indexes); vector<string> indexes = readIndexes(); @@ -144,7 +144,7 @@ void Test::requireThatInvalidFusionIndexesAreRemoved() { void Test::requireThatRemoveDontTouchNewIndexes() { createIndexes(); - FastOS_File((index_dir + "/index.flush.4/serial.dat").c_str()).Delete(); + std::filesystem::remove(std::filesystem::path(index_dir + "/index.flush.4/serial.dat")); DiskIndexes disk_indexes; DiskIndexCleaner::removeOldIndexes(index_dir, disk_indexes); vector<string> indexes = readIndexes(); diff --git a/searchcore/src/tests/proton/index/indexmanager_test.cpp b/searchcore/src/tests/proton/index/indexmanager_test.cpp index 2f6ebcd967f..a7209ea8897 100644 --- a/searchcore/src/tests/proton/index/indexmanager_test.cpp +++ b/searchcore/src/tests/proton/index/indexmanager_test.cpp @@ -728,7 +728,7 @@ TEST_F(IndexManagerTest, require_that_serial_number_is_read_on_load) void crippleFusion(uint32_t fusionId) { vespalib::asciistream ost; ost << index_dir << "/index.flush." << fusionId << "/serial.dat"; - FastOS_File(ost.str().data()).Delete(); + std::filesystem::remove(std::filesystem::path(ost.str())); } TEST_F(IndexManagerTest, require_that_failed_fusion_is_retried) diff --git a/vespalib/src/tests/fileheader/fileheader_test.cpp b/vespalib/src/tests/fileheader/fileheader_test.cpp index 21e374e4f62..911c6ef7cfe 100644 --- a/vespalib/src/tests/fileheader/fileheader_test.cpp +++ b/vespalib/src/tests/fileheader/fileheader_test.cpp @@ -4,9 +4,16 @@ #include <vespa/vespalib/data/fileheader.h> #include <vespa/vespalib/data/databuffer.h> #include <vespa/fastos/file.h> +#include <filesystem> using namespace vespalib; +namespace { + +vespalib::string fileheader_tmp("fileheader.tmp"); + +} + class Test : public vespalib::TestApp { private: void testTag(); @@ -337,7 +344,7 @@ Test::testFileReader() { { FastOS_File file; - ASSERT_TRUE(file.OpenWriteOnlyTruncate("fileheader.tmp")); + ASSERT_TRUE(file.OpenWriteOnlyTruncate(fileheader_tmp.c_str())); uint8_t buf[256]; for (uint32_t i = 0; i < 256; ++i) { @@ -347,7 +354,7 @@ Test::testFileReader() } { FastOS_File file; - ASSERT_TRUE(file.OpenReadOnly("fileheader.tmp")); + ASSERT_TRUE(file.OpenReadOnly(fileheader_tmp.c_str())); FileHeader::FileReader reader(file); char buf[7]; @@ -362,7 +369,7 @@ Test::testFileReader() EXPECT_EQUAL(256u, sum); ASSERT_TRUE(file.Close()); - file.Delete(); + std::filesystem::remove(std::filesystem::path(fileheader_tmp)); } } @@ -371,7 +378,7 @@ Test::testFileWriter() { { FastOS_File file; - ASSERT_TRUE(file.OpenWriteOnlyTruncate("fileheader.tmp")); + ASSERT_TRUE(file.OpenWriteOnlyTruncate(fileheader_tmp.c_str())); FileHeader::FileWriter writer(file); uint32_t sum = 0; @@ -388,7 +395,7 @@ Test::testFileWriter() } { FastOS_File file; - ASSERT_TRUE(file.OpenReadOnly("fileheader.tmp")); + ASSERT_TRUE(file.OpenReadOnly(fileheader_tmp.c_str())); uint8_t buf[256]; EXPECT_EQUAL(256, file.Read(buf, 256)); @@ -397,7 +404,7 @@ Test::testFileWriter() } ASSERT_TRUE(file.Close()); - file.Delete(); + std::filesystem::remove(std::filesystem::path(fileheader_tmp)); } } @@ -412,13 +419,13 @@ Test::testFileHeader() header.putTag(FileHeader::Tag("baz", "666999")); FastOS_File file; - ASSERT_TRUE(file.OpenWriteOnlyTruncate("fileheader.tmp")); + ASSERT_TRUE(file.OpenWriteOnlyTruncate(fileheader_tmp.c_str())); len = header.writeFile(file); EXPECT_EQUAL(len, header.getSize()); } { FastOS_File file; - ASSERT_TRUE(file.OpenReadWrite("fileheader.tmp")); + ASSERT_TRUE(file.OpenReadWrite(fileheader_tmp.c_str())); FileHeader header; EXPECT_EQUAL(len, header.readFile(file)); @@ -441,11 +448,11 @@ Test::testFileHeader() FileHeader header; FastOS_File file; - ASSERT_TRUE(file.OpenReadOnly("fileheader.tmp")); + ASSERT_TRUE(file.OpenReadOnly(fileheader_tmp.c_str())); EXPECT_EQUAL(len, header.readFile(file)); EXPECT_EQUAL(len, header.getSize()); ASSERT_TRUE(file.Close()); - file.Delete(); + std::filesystem::remove(std::filesystem::path(fileheader_tmp)); EXPECT_TRUE(header.hasTag("foo")); EXPECT_EQUAL(9.6, header.getTag("foo").asFloat()); @@ -571,12 +578,12 @@ Test::testRewriteErrors() { FastOS_File file; - ASSERT_TRUE(file.OpenWriteOnlyTruncate("fileheader.tmp")); + ASSERT_TRUE(file.OpenWriteOnlyTruncate(fileheader_tmp.c_str())); EXPECT_EQUAL(len, header.writeFile(file)); } { FastOS_File file; - ASSERT_TRUE(file.OpenReadWrite("fileheader.tmp")); + ASSERT_TRUE(file.OpenReadWrite(fileheader_tmp.c_str())); header.putTag(FileHeader::Tag("baz", "cox")); EXPECT_TRUE(len != header.getSize()); try { |