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

Commit a3ece96f authored by Tao Bao's avatar Tao Bao
Browse files

tests: Replace the O_RDONLY in access(2). 

Although O_RDONLY gives the same value as F_OK (0), it's not the right
friend of access(2).

Also clean up the temporary files from ZipTest (TemporaryDir doesn't
like non-empty directory).

Test: recovery_unit_test passes and has no leftover.
Change-Id: I66b90e43c0954c89ce08b36b9e2b4e84183b28f5
parent e81719dd

tests/manual/recovery_test.cpp

+1 −2
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
 * limitations under the License.

 */



#include <fcntl.h>

#include <string.h>

#include <sys/types.h>

#include <unistd.h>
@@ -79,7 +78,7 @@ TEST(recovery, persist) { 
  std::string buf;

  EXPECT_TRUE(android::base::ReadFileToString(myFilename, &buf));

  EXPECT_EQ(myContent, buf);

  if (access(myFilename.c_str(), O_RDONLY) == 0) {

  if (access(myFilename.c_str(), F_OK) == 0) {

    fprintf(stderr, "Removing persistent test data, "

        "check if reconstructed on reboot\n");

  }

tests/unit/zip_test.cpp

+15 −6
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
 */



#include <errno.h>

#include <fcntl.h>

#include <unistd.h>



#include <memory>
@@ -42,10 +41,10 @@ TEST(ZipTest, ExtractPackageRecursive) { 


  // Make sure all the files are extracted correctly.

  std::string path(td.path);

  ASSERT_EQ(0, access((path + "/a.txt").c_str(), O_RDONLY));

  ASSERT_EQ(0, access((path + "/b.txt").c_str(), O_RDONLY));

  ASSERT_EQ(0, access((path + "/b/c.txt").c_str(), O_RDONLY));

  ASSERT_EQ(0, access((path + "/b/d.txt").c_str(), O_RDONLY));

  ASSERT_EQ(0, access((path + "/a.txt").c_str(), F_OK));

  ASSERT_EQ(0, access((path + "/b.txt").c_str(), F_OK));

  ASSERT_EQ(0, access((path + "/b/c.txt").c_str(), F_OK));

  ASSERT_EQ(0, access((path + "/b/d.txt").c_str(), F_OK));



  // The content of the file is the same as expected.

  std::string content1;
@@ -54,7 +53,16 @@ TEST(ZipTest, ExtractPackageRecursive) { 


  std::string content2;

  ASSERT_TRUE(android::base::ReadFileToString(path + "/b/d.txt", &content2));

  ASSERT_EQ(kBTxtContents, content2);

  ASSERT_EQ(kDTxtContents, content2);



  CloseArchive(handle);



  // Clean up.

  ASSERT_EQ(0, unlink((path + "/a.txt").c_str()));

  ASSERT_EQ(0, unlink((path + "/b.txt").c_str()));

  ASSERT_EQ(0, unlink((path + "/b/c.txt").c_str()));

  ASSERT_EQ(0, unlink((path + "/b/d.txt").c_str()));

  ASSERT_EQ(0, rmdir((path + "/b").c_str()));

}



TEST(ZipTest, OpenFromMemory) {
@@ -76,6 +84,7 @@ TEST(ZipTest, OpenFromMemory) { 
  ASSERT_NE(-1, tmp_binary.fd);

  ASSERT_EQ(0, ExtractEntryToFile(handle, &binary_entry, tmp_binary.fd));



  CloseArchive(handle);

  sysReleaseMap(&map);

}