diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-01-26 15:41:06 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-01-26 15:59:29 +0000 |
commit | 237fe9d1d62d215721f120f5ec6399fc1456119a (patch) | |
tree | 64fd0aacaeb15a97b917490277c6e9e5e8bd79cf /searchlib/src/tests | |
parent | 972de79bfeebf0d9f78a28067969494536d65ca5 (diff) |
- assert result of Close() in destructor of FastOS_File and FastOS_BufferedFile.
- Check result of Close()
- Check result of Sync()
- Scope FastOS_File to avoid explicit Close().
- NULL -> nullptr
Diffstat (limited to 'searchlib/src/tests')
6 files changed, 4 insertions, 25 deletions
diff --git a/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp b/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp index 8a6f1e08fa6..c77dfb2c2d2 100644 --- a/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp +++ b/searchlib/src/tests/attribute/tensorattribute/tensorattribute_test.cpp @@ -681,7 +681,6 @@ Fixture::get_file_header() vespalib::string file_name = attr_name + ".dat"; EXPECT_TRUE(file.OpenReadOnly(file_name.c_str())); (void) header.readFile(file); - file.Close(); return header; } diff --git a/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp b/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp index 6c78d185cfb..0fc42ae3fad 100644 --- a/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp +++ b/searchlib/src/tests/diskindex/fieldwriter/fieldwriter_test.cpp @@ -330,7 +330,6 @@ FileChecksum::FileChecksum(const vespalib::string &file_name) EVP_DigestUpdate(md_ctx.get(), buf.get(), thistime); remainder -= thistime; } - f.Close(); EVP_DigestFinal_ex(md_ctx.get(), &_digest[0], &_digest_len); assert(_digest_len > 0u && _digest_len <= EVP_MAX_MD_SIZE); } diff --git a/searchlib/src/tests/fileheadertk/fileheadertk_test.cpp b/searchlib/src/tests/fileheadertk/fileheadertk_test.cpp index 3662e371839..089650573e2 100644 --- a/searchlib/src/tests/fileheadertk/fileheadertk_test.cpp +++ b/searchlib/src/tests/fileheadertk/fileheadertk_test.cpp @@ -9,24 +9,7 @@ LOG_SETUP("fileheadertk_test"); using namespace search; -class Test : public vespalib::TestApp { -private: - void testVersionTags(); - -public: - int Main() override { - TEST_INIT("fileheadertk_test"); - - testVersionTags(); TEST_FLUSH(); - - TEST_DONE(); - } -}; - -TEST_APPHOOK(Test); - -void -Test::testVersionTags() +TEST("testVersionTags") { vespalib::FileHeader header; FileHeaderTk::addVersionTags(header); @@ -34,7 +17,6 @@ Test::testVersionTags() FastOS_File file; ASSERT_TRUE(file.OpenWriteOnlyTruncate("versiontags.dat")); EXPECT_EQUAL(header.getSize(), header.writeFile(file)); - file.Close(); EXPECT_EQUAL(8u, header.getNumTags()); EXPECT_TRUE(header.hasTag("version-arch")); @@ -46,3 +28,5 @@ Test::testVersionTags() EXPECT_TRUE(header.hasTag("version-tag")); EXPECT_TRUE(header.hasTag("version-pkg")); } + +TEST_MAIN() { TEST_RUN_ALL(); }
\ No newline at end of file diff --git a/searchlib/src/tests/transactionlog/translogclient_test.cpp b/searchlib/src/tests/transactionlog/translogclient_test.cpp index d3c3af3a9ca..fa0753373bf 100644 --- a/searchlib/src/tests/transactionlog/translogclient_test.cpp +++ b/searchlib/src/tests/transactionlog/translogclient_test.cpp @@ -967,7 +967,6 @@ TEST("test truncation after short read") { FastOS_File trfile(filename.c_str()); EXPECT_TRUE(trfile.OpenReadWrite(nullptr)); trfile.SetSize(trfile.getSize() - 1); - trfile.Close(); } { TransLogServer tlss(topdir.getDir(), 18377, ".", fileHeaderContext, domainConfig); diff --git a/searchlib/src/tests/util/rawbuf_test.cpp b/searchlib/src/tests/util/rawbuf_test.cpp index e24314336af..1963833947f 100644 --- a/searchlib/src/tests/util/rawbuf_test.cpp +++ b/searchlib/src/tests/util/rawbuf_test.cpp @@ -129,7 +129,7 @@ TEST("require that rawbuf can read from file") { buf.readFile(file, 100); EXPECT_EQUAL("foobarbaz", getString(buf)); - file.Close(); + ASSERT_TRUE(file.Close()); file.Delete(); } diff --git a/searchlib/src/tests/vespa-fileheader-inspect/vespa-fileheader-inspect_test.cpp b/searchlib/src/tests/vespa-fileheader-inspect/vespa-fileheader-inspect_test.cpp index 15c7e114761..7ea480bf542 100644 --- a/searchlib/src/tests/vespa-fileheader-inspect/vespa-fileheader-inspect_test.cpp +++ b/searchlib/src/tests/vespa-fileheader-inspect/vespa-fileheader-inspect_test.cpp @@ -17,7 +17,6 @@ bool writeHeader(const FileHeader &header, const vespalib::string &fileName) { if (!EXPECT_EQUAL(header.getSize(), header.writeFile(file))) { return false; } - file.Close(); return true; } @@ -30,7 +29,6 @@ vespalib::string readFile(const vespalib::string &fileName) { EXPECT_LESS(len, sizeof(buf)); // make sure we got everything vespalib::string str(buf, len); - file.Close(); return str; } |