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

Commit f37bb8e4 authored by Narayan Kamath's avatar Narayan Kamath
Browse files

zip_archive: Fix tests broken by 1f93d710. 

Moving to std::hash changed iteration order but these tests should
not have relied on hash_map iteration order anyway.

Test: zip_archive_test

Change-Id: I712bf2307c8770f03ea6f074bfc506a40cdcb066
parent df9fbc7d

libziparchive/zip_archive_test.cc

+27 −104
Original line number Diff line number Diff line
@@ -64,11 +64,6 @@ static int32_t OpenArchiveWrapper(const std::string& name, ZipArchiveHandle* han 
  return OpenArchive(abs_path.c_str(), handle);

}



static void AssertNameEquals(const std::string& name_str, const ZipString& name) {

  ASSERT_EQ(name_str.size(), name.name_length);

  ASSERT_EQ(0, memcmp(name_str.c_str(), name.name, name.name_length));

}



static void SetZipString(ZipString* zip_str, const std::string& str) {

  zip_str->name = reinterpret_cast<const uint8_t*>(str.c_str());

  zip_str->name_length = str.size();
@@ -117,132 +112,60 @@ TEST(ziparchive, OpenDoNotAssumeFdOwnership) { 
  close(fd);

}



TEST(ziparchive, Iteration) {

static void AssertIterationOrder(const ZipString* prefix, const ZipString* suffix,

                                 const std::vector<std::string>& expected_names_sorted) {

  ZipArchiveHandle handle;

  ASSERT_EQ(0, OpenArchiveWrapper(kValidZip, &handle));



  void* iteration_cookie;

  ASSERT_EQ(0, StartIteration(handle, &iteration_cookie, nullptr, nullptr));

  ASSERT_EQ(0, StartIteration(handle, &iteration_cookie, prefix, suffix));



  ZipEntry data;

  ZipString name;

  std::vector<std::string> names;



  // b/c.txt

  ASSERT_EQ(0, Next(iteration_cookie, &data, &name));

  AssertNameEquals("b/c.txt", name);



  // b/d.txt

  ASSERT_EQ(0, Next(iteration_cookie, &data, &name));

  AssertNameEquals("b/d.txt", name);



  // a.txt

  ASSERT_EQ(0, Next(iteration_cookie, &data, &name));

  AssertNameEquals("a.txt", name);



  // b.txt

  ASSERT_EQ(0, Next(iteration_cookie, &data, &name));

  AssertNameEquals("b.txt", name);



  // b/

  ZipString name;

  for (size_t i = 0; i < expected_names_sorted.size(); ++i) {

    ASSERT_EQ(0, Next(iteration_cookie, &data, &name));

  AssertNameEquals("b/", name);

    names.push_back(std::string(reinterpret_cast<const char*>(name.name), name.name_length));

  }



  // End of iteration.

  ASSERT_EQ(-1, Next(iteration_cookie, &data, &name));



  CloseArchive(handle);

}



TEST(ziparchive, IterationWithPrefix) {

  ZipArchiveHandle handle;

  ASSERT_EQ(0, OpenArchiveWrapper(kValidZip, &handle));



  void* iteration_cookie;

  ZipString prefix("b/");

  ASSERT_EQ(0, StartIteration(handle, &iteration_cookie, &prefix, nullptr));



  ZipEntry data;

  ZipString name;



  // b/c.txt

  ASSERT_EQ(0, Next(iteration_cookie, &data, &name));

  AssertNameEquals("b/c.txt", name);

  // Assert that the names are as expected.

  std::sort(names.begin(), names.end());

  ASSERT_EQ(expected_names_sorted, names);

}



  // b/d.txt

  ASSERT_EQ(0, Next(iteration_cookie, &data, &name));

  AssertNameEquals("b/d.txt", name);

TEST(ziparchive, Iteration) {

  static const std::vector<std::string> kExpectedMatchesSorted = {"a.txt", "b.txt", "b/", "b/c.txt",

                                                                  "b/d.txt"};



  // b/

  ASSERT_EQ(0, Next(iteration_cookie, &data, &name));

  AssertNameEquals("b/", name);

  AssertIterationOrder(nullptr, nullptr, kExpectedMatchesSorted);

}



  // End of iteration.

  ASSERT_EQ(-1, Next(iteration_cookie, &data, &name));

TEST(ziparchive, IterationWithPrefix) {

  ZipString prefix("b/");

  static const std::vector<std::string> kExpectedMatchesSorted = {"b/", "b/c.txt", "b/d.txt"};



  CloseArchive(handle);

  AssertIterationOrder(&prefix, nullptr, kExpectedMatchesSorted);

}



TEST(ziparchive, IterationWithSuffix) {

  ZipArchiveHandle handle;

  ASSERT_EQ(0, OpenArchiveWrapper(kValidZip, &handle));



  void* iteration_cookie;

  ZipString suffix(".txt");

  ASSERT_EQ(0, StartIteration(handle, &iteration_cookie, nullptr, &suffix));



  ZipEntry data;

  ZipString name;

  static const std::vector<std::string> kExpectedMatchesSorted = {"a.txt", "b.txt", "b/c.txt",

                                                                  "b/d.txt"};



  // b/c.txt

  ASSERT_EQ(0, Next(iteration_cookie, &data, &name));

  AssertNameEquals("b/c.txt", name);



  // b/d.txt

  ASSERT_EQ(0, Next(iteration_cookie, &data, &name));

  AssertNameEquals("b/d.txt", name);



  // a.txt

  ASSERT_EQ(0, Next(iteration_cookie, &data, &name));

  AssertNameEquals("a.txt", name);



  // b.txt

  ASSERT_EQ(0, Next(iteration_cookie, &data, &name));

  AssertNameEquals("b.txt", name);



  // End of iteration.

  ASSERT_EQ(-1, Next(iteration_cookie, &data, &name));



  CloseArchive(handle);

  AssertIterationOrder(nullptr, &suffix, kExpectedMatchesSorted);

}



TEST(ziparchive, IterationWithPrefixAndSuffix) {

  ZipArchiveHandle handle;

  ASSERT_EQ(0, OpenArchiveWrapper(kValidZip, &handle));



  void* iteration_cookie;

  ZipString prefix("b");

  ZipString suffix(".txt");

  ASSERT_EQ(0, StartIteration(handle, &iteration_cookie, &prefix, &suffix));



  ZipEntry data;

  ZipString name;



  // b/c.txt

  ASSERT_EQ(0, Next(iteration_cookie, &data, &name));

  AssertNameEquals("b/c.txt", name);



  // b/d.txt

  ASSERT_EQ(0, Next(iteration_cookie, &data, &name));

  AssertNameEquals("b/d.txt", name);



  // b.txt

  ASSERT_EQ(0, Next(iteration_cookie, &data, &name));

  AssertNameEquals("b.txt", name);

  static const std::vector<std::string> kExpectedMatchesSorted = {"b.txt", "b/c.txt", "b/d.txt"};



  // End of iteration.

  ASSERT_EQ(-1, Next(iteration_cookie, &data, &name));



  CloseArchive(handle);

  AssertIterationOrder(&prefix, &suffix, kExpectedMatchesSorted);

}



TEST(ziparchive, IterationWithBadPrefixAndSuffix) {