summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2016-12-22 18:33:33 +0100
committerandroid-build-merger <android-build-merger@google.com>2016-12-22 18:33:33 +0100
commit5a108b6e00190885295d3fd40b98aebf89379533 (patch)
tree0fdc5c6c8d29396b07e99e84750340ad7bd3c896 /tests
parentMerge "tests: Add testcase for ZipUtil." am: aa305e9ce8 am: 6df1c4579e (diff)
parentMerge "tests: Replace the O_RDONLY in access(2)." am: 3b9645288e (diff)
downloadandroid_bootable_recovery-5a108b6e00190885295d3fd40b98aebf89379533.tar
android_bootable_recovery-5a108b6e00190885295d3fd40b98aebf89379533.tar.gz
android_bootable_recovery-5a108b6e00190885295d3fd40b98aebf89379533.tar.bz2
android_bootable_recovery-5a108b6e00190885295d3fd40b98aebf89379533.tar.lz
android_bootable_recovery-5a108b6e00190885295d3fd40b98aebf89379533.tar.xz
android_bootable_recovery-5a108b6e00190885295d3fd40b98aebf89379533.tar.zst
android_bootable_recovery-5a108b6e00190885295d3fd40b98aebf89379533.zip
Diffstat (limited to 'tests')
-rw-r--r--tests/manual/recovery_test.cpp3
-rw-r--r--tests/unit/zip_test.cpp21
2 files changed, 16 insertions, 8 deletions
diff --git a/tests/manual/recovery_test.cpp b/tests/manual/recovery_test.cpp
index e83849546..e73cb1509 100644
--- a/tests/manual/recovery_test.cpp
+++ b/tests/manual/recovery_test.cpp
@@ -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");
}
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);
}