ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "zip_archive: Fix a few more badly written tests."

Browse source 
am: 93d344d98c

Change-Id: Iaaa56006cc57acf8950040fa99cacae828c5858e
This commit is contained in:
Narayan Kamath 2017-12-27 11:41:44 +00:00 • committed by android-build-merger
commit 000e0bfff4
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libziparchive/zip_archive_test.cc
View file

@ -587,10 +587,11 @@ static void ExtractEntryToMemory(const std::vector<uint8_t>& zip_data,
// an entry whose name is "name" and whose size is 12 (contents = // an entry whose name is "name" and whose size is 12 (contents =
// "abdcdefghijk"). // "abdcdefghijk").
ZipEntry entry; ZipEntry entry;
ZipString empty_name; ZipString name;
SetZipString(&empty_name, "name"); std::string name_str = "name";
SetZipString(&name, name_str);
ASSERT_EQ(0, FindEntry(handle, empty_name, &entry)); ASSERT_EQ(0, FindEntry(handle, name, &entry));
ASSERT_EQ(static_cast<uint32_t>(12), entry.uncompressed_length); ASSERT_EQ(static_cast<uint32_t>(12), entry.uncompressed_length);
entry_out->resize(12); entry_out->resize(12);
@ -610,7 +611,7 @@ TEST(ziparchive, ValidDataDescriptors) {
ASSERT_EQ('k', entry[11]); ASSERT_EQ('k', entry[11]);
} }
TEST(ziparchive, InvalidDataDescriptors) { TEST(ziparchive, InvalidDataDescriptors_csize) {
std::vector<uint8_t> invalid_csize = kDataDescriptorZipFile; std::vector<uint8_t> invalid_csize = kDataDescriptorZipFile;
invalid_csize[kCSizeOffset] = 0xfe; invalid_csize[kCSizeOffset] = 0xfe;
@ -619,13 +620,15 @@ TEST(ziparchive, InvalidDataDescriptors) {
ExtractEntryToMemory(invalid_csize, &entry, &error_code); ExtractEntryToMemory(invalid_csize, &entry, &error_code);
ASSERT_EQ(kInconsistentInformation, error_code); ASSERT_EQ(kInconsistentInformation, error_code);
}
TEST(ziparchive, InvalidDataDescriptors_size) {
std::vector<uint8_t> invalid_size = kDataDescriptorZipFile; std::vector<uint8_t> invalid_size = kDataDescriptorZipFile;
invalid_csize[kSizeOffset] = 0xfe; invalid_size[kSizeOffset] = 0xfe;
error_code = 0; std::vector<uint8_t> entry;
entry.clear(); int32_t error_code = 0;
ExtractEntryToMemory(invalid_csize, &entry, &error_code); ExtractEntryToMemory(invalid_size, &entry, &error_code);
ASSERT_EQ(kInconsistentInformation, error_code); ASSERT_EQ(kInconsistentInformation, error_code);
} }