diff options
| author | Tao Bao <tbao@google.com> | 2016-12-22 18:23:04 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-22 18:23:04 +0100 |
| commit | baf422229d36cb2ac278c874c17f485af2826546 (patch) | |
| tree | 10948a3e00fc65d5859e48a0f0a01e05a12c5fe4 /tests/unit/zip_test.cpp | |
| parent | Merge "tests: Add testcase for ZipUtil." (diff) | |
| parent | Merge "tests: Replace the O_RDONLY in access(2)." (diff) | |
| download | android_bootable_recovery-baf422229d36cb2ac278c874c17f485af2826546.tar android_bootable_recovery-baf422229d36cb2ac278c874c17f485af2826546.tar.gz android_bootable_recovery-baf422229d36cb2ac278c874c17f485af2826546.tar.bz2 android_bootable_recovery-baf422229d36cb2ac278c874c17f485af2826546.tar.lz android_bootable_recovery-baf422229d36cb2ac278c874c17f485af2826546.tar.xz android_bootable_recovery-baf422229d36cb2ac278c874c17f485af2826546.tar.zst android_bootable_recovery-baf422229d36cb2ac278c874c17f485af2826546.zip | |
Diffstat (limited to 'tests/unit/zip_test.cpp')
| -rw-r--r-- | tests/unit/zip_test.cpp | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/tests/unit/zip_test.cpp b/tests/unit/zip_test.cpp index ef0ee4c1d..4a1a49b97 100644 --- a/tests/unit/zip_test.cpp +++ b/tests/unit/zip_test.cpp @@ -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); } |