Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 93d344d9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 2da01a2a c36b8092

libziparchive/zip_archive_test.cc

+11 −8
Original line number Original line Diff line number Diff line
@@ -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);

}

}