summaryrefslogtreecommitdiffstats
path: root/tests/unit/zip_test.cpp
diff options
context:
space:
mode:
authorTao Bao <tbao@google.com>2017-05-03 01:51:32 +0200
committerandroid-build-merger <android-build-merger@google.com>2017-05-03 01:51:32 +0200
commit586377d1f3f0fa3c03664b702affbbf4ea0c3a9e (patch)
treec8f081f291c35d73cef9cc1c6a775c1e6a52bcb2 /tests/unit/zip_test.cpp
parentMerge "recovery: Change install_package() to take std::string." am: ba365180d3 am: c0c4ae1583 (diff)
parentMerge "Move sysMapFile and sysReleaseMap into MemMapping class." am: fe7eecff4c (diff)
downloadandroid_bootable_recovery-586377d1f3f0fa3c03664b702affbbf4ea0c3a9e.tar
android_bootable_recovery-586377d1f3f0fa3c03664b702affbbf4ea0c3a9e.tar.gz
android_bootable_recovery-586377d1f3f0fa3c03664b702affbbf4ea0c3a9e.tar.bz2
android_bootable_recovery-586377d1f3f0fa3c03664b702affbbf4ea0c3a9e.tar.lz
android_bootable_recovery-586377d1f3f0fa3c03664b702affbbf4ea0c3a9e.tar.xz
android_bootable_recovery-586377d1f3f0fa3c03664b702affbbf4ea0c3a9e.tar.zst
android_bootable_recovery-586377d1f3f0fa3c03664b702affbbf4ea0c3a9e.zip
Diffstat (limited to 'tests/unit/zip_test.cpp')
-rw-r--r--tests/unit/zip_test.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/unit/zip_test.cpp b/tests/unit/zip_test.cpp
index 4a1a49b97..df4e38cae 100644
--- a/tests/unit/zip_test.cpp
+++ b/tests/unit/zip_test.cpp
@@ -66,9 +66,9 @@ TEST(ZipTest, ExtractPackageRecursive) {
}
TEST(ZipTest, OpenFromMemory) {
- MemMapping map;
std::string zip_path = from_testdata_base("ziptest_dummy-update.zip");
- ASSERT_EQ(0, sysMapFile(zip_path.c_str(), &map));
+ MemMapping map;
+ ASSERT_TRUE(map.MapFile(zip_path));
// Map an update package into memory and open the archive from there.
ZipArchiveHandle handle;
@@ -85,6 +85,5 @@ TEST(ZipTest, OpenFromMemory) {
ASSERT_EQ(0, ExtractEntryToFile(handle, &binary_entry, tmp_binary.fd));
CloseArchive(handle);
- sysReleaseMap(&map);
}