diff options
| author | Josh Gao <jmgao@google.com> | 2018-11-16 19:58:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-11-16 19:58:27 +0000 |
| commit | 3a2bd498f8703ca7fcd281da25e027ea00833e1c (patch) | |
| tree | 851c3a64e8fc613dabf6ecf270f2582bfc419ef7 | |
| parent | 5d4f420c8cd7c83ee245a6be3f04153cca29c8f3 (diff) | |
| parent | 5db84229e1feb08729626e8bea09bb0b067f6ac9 (diff) | |
Merge "Fix double closes in ziparchive tests."
| -rw-r--r-- | libziparchive/zip_archive_test.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libziparchive/zip_archive_test.cc b/libziparchive/zip_archive_test.cc index 500a531c0..cea42d4ca 100644 --- a/libziparchive/zip_archive_test.cc +++ b/libziparchive/zip_archive_test.cc @@ -297,7 +297,7 @@ TEST(ziparchive, EmptyEntries) { ASSERT_TRUE(android::base::WriteFully(tmp_file.fd, kEmptyEntriesZip, sizeof(kEmptyEntriesZip))); ZipArchiveHandle handle; - ASSERT_EQ(0, OpenArchiveFd(tmp_file.fd, "EmptyEntriesTest", &handle)); + ASSERT_EQ(0, OpenArchiveFd(tmp_file.fd, "EmptyEntriesTest", &handle, false)); ZipEntry entry; ZipString empty_name; @@ -322,7 +322,7 @@ TEST(ziparchive, EntryLargerThan32K) { ASSERT_TRUE(android::base::WriteFully(tmp_file.fd, reinterpret_cast<const uint8_t*>(kAbZip), sizeof(kAbZip) - 1)); ZipArchiveHandle handle; - ASSERT_EQ(0, OpenArchiveFd(tmp_file.fd, "EntryLargerThan32KTest", &handle)); + ASSERT_EQ(0, OpenArchiveFd(tmp_file.fd, "EntryLargerThan32KTest", &handle, false)); ZipEntry entry; ZipString ab_name; @@ -369,7 +369,7 @@ TEST(ziparchive, TrailerAfterEOCD) { ASSERT_TRUE(android::base::WriteFully(tmp_file.fd, trailer, sizeof(trailer))); ZipArchiveHandle handle; - ASSERT_GT(0, OpenArchiveFd(tmp_file.fd, "EmptyEntriesTest", &handle)); + ASSERT_GT(0, OpenArchiveFd(tmp_file.fd, "EmptyEntriesTest", &handle, false)); } TEST(ziparchive, ExtractToFile) { @@ -579,7 +579,7 @@ static void ExtractEntryToMemory(const std::vector<uint8_t>& zip_data, ASSERT_NE(-1, tmp_file.fd); ASSERT_TRUE(android::base::WriteFully(tmp_file.fd, &zip_data[0], zip_data.size())); ZipArchiveHandle handle; - ASSERT_EQ(0, OpenArchiveFd(tmp_file.fd, "ExtractEntryToMemory", &handle)); + ASSERT_EQ(0, OpenArchiveFd(tmp_file.fd, "ExtractEntryToMemory", &handle, false)); // This function expects a variant of kDataDescriptorZipFile, for look for // an entry whose name is "name" and whose size is 12 (contents = @@ -687,7 +687,7 @@ TEST(ziparchive, BrokenLfhSignature) { ASSERT_TRUE(android::base::WriteFully(tmp_file.fd, &kZipFileWithBrokenLfhSignature[0], kZipFileWithBrokenLfhSignature.size())); ZipArchiveHandle handle; - ASSERT_EQ(-1, OpenArchiveFd(tmp_file.fd, "LeadingNonZipBytes", &handle)); + ASSERT_EQ(-1, OpenArchiveFd(tmp_file.fd, "LeadingNonZipBytes", &handle, false)); } class VectorReader : public zip_archive::Reader { |