tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

tests: Fix unit/zip_test.cpp.

Browse source 
It's accidentally broken when refactoring the testdata path. Also clean
up the testcase a bit by simplying the file reading.

Test: recovery_unit_test passes.

Change-Id: I592a1cf5a4eb9a7a5f4eecbc6426baeedeb02781
This commit is contained in:
Tao Bao 2016-11-04 15:15:52 -07:00
parent d0daf7f7df
commit 0dfb7536bb
1 changed files with 46 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
tests/unit/zip_test.cpp
View file

@ -16,78 +16,69 @@
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include <pthread.h>
#include <unistd.h> #include <unistd.h>
#include <memory> #include <memory>
#include <vector> #include <vector>
#include <android-base/file.h> #include <android-base/file.h>
#include <android-base/stringprintf.h>
#include <android-base/unique_fd.h>
#include <android-base/test_utils.h> #include <android-base/test_utils.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <otautil/SysUtil.h> #include <otautil/SysUtil.h>
#include <otautil/ZipUtil.h> #include <otautil/ZipUtil.h>
#include <ziparchive/zip_archive.h> #include <ziparchive/zip_archive.h>
static const std::string DATA_PATH(getenv("ANDROID_DATA")); #include "common/test_constants.h"
static const std::string TESTDATA_PATH("/recovery/testdata/");
static const std::vector<uint8_t> kATxtContents { static const std::string kATxtContents("abcdefghabcdefgh\n");
'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', static const std::string kBTxtContents("abcdefgh\n");
'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h',
'\n'
};
static const std::vector<uint8_t> kBTxtContents { TEST(ZipTest, ExtractPackageRecursive) {
'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', std::string zip_path = from_testdata_base("ziptest_valid.zip");
'\n'
};
TEST(otazip, ExtractPackageRecursive) {
TemporaryDir td;
ASSERT_NE(td.path, nullptr);
ZipArchiveHandle handle; ZipArchiveHandle handle;
std::string zip_path = DATA_PATH + TESTDATA_PATH + "/ziptest_valid.zip";
ASSERT_EQ(0, OpenArchive(zip_path.c_str(), &handle)); ASSERT_EQ(0, OpenArchive(zip_path.c_str(), &handle));
// Extract the whole package into a temp directory. // Extract the whole package into a temp directory.
TemporaryDir td;
ASSERT_NE(nullptr, td.path);
ExtractPackageRecursive(handle, "", td.path, nullptr, nullptr); ExtractPackageRecursive(handle, "", td.path, nullptr, nullptr);
// Make sure all the files are extracted correctly. // Make sure all the files are extracted correctly.
std::string path(td.path); std::string path(td.path);
android::base::unique_fd fd(open((path + "/a.txt").c_str(), O_RDONLY)); ASSERT_EQ(0, access((path + "/a.txt").c_str(), O_RDONLY));
ASSERT_NE(fd, -1); ASSERT_EQ(0, access((path + "/b.txt").c_str(), O_RDONLY));
std::vector<uint8_t> read_data; ASSERT_EQ(0, access((path + "/b/c.txt").c_str(), O_RDONLY));
read_data.resize(kATxtContents.size()); ASSERT_EQ(0, access((path + "/b/d.txt").c_str(), O_RDONLY));
// The content of the file is the same as expected.
ASSERT_TRUE(android::base::ReadFully(fd.get(), read_data.data(), read_data.size()));
ASSERT_EQ(0, memcmp(read_data.data(), kATxtContents.data(), kATxtContents.size()));
fd.reset(open((path + "/b.txt").c_str(), O_RDONLY)); // The content of the file is the same as expected.
ASSERT_NE(fd, -1); std::string content1;
fd.reset(open((path + "/b/c.txt").c_str(), O_RDONLY)); ASSERT_TRUE(android::base::ReadFileToString(path + "/a.txt", &content1));
ASSERT_NE(fd, -1); ASSERT_EQ(kATxtContents, content1);
fd.reset(open((path + "/b/d.txt").c_str(), O_RDONLY));
ASSERT_NE(fd, -1); std::string content2;
read_data.resize(kBTxtContents.size()); ASSERT_TRUE(android::base::ReadFileToString(path + "/b/d.txt", &content2));
ASSERT_TRUE(android::base::ReadFully(fd.get(), read_data.data(), read_data.size())); ASSERT_EQ(kBTxtContents, content2);
ASSERT_EQ(0, memcmp(read_data.data(), kBTxtContents.data(), kBTxtContents.size()));
} }
TEST(otazip, OpenFromMemory) { TEST(ZipTest, OpenFromMemory) {
MemMapping map; MemMapping map;
std::string zip_path = DATA_PATH + TESTDATA_PATH + "/ziptest_dummy-update.zip"; std::string zip_path = from_testdata_base("ziptest_dummy-update.zip");
ASSERT_EQ(0, sysMapFile(zip_path.c_str(), &map)); ASSERT_EQ(0, sysMapFile(zip_path.c_str(), &map));
// Map an update package into memory and open the archive from there. // Map an update package into memory and open the archive from there.
ZipArchiveHandle handle; ZipArchiveHandle handle;
ASSERT_EQ(0, OpenArchiveFromMemory(map.addr, map.length, zip_path.c_str(), &handle)); ASSERT_EQ(0, OpenArchiveFromMemory(map.addr, map.length, zip_path.c_str(), &handle));
static constexpr const char* BINARY_PATH = "META-INF/com/google/android/update-binary"; static constexpr const char* BINARY_PATH = "META-INF/com/google/android/update-binary";
ZipString binary_path(BINARY_PATH); ZipString binary_path(BINARY_PATH);
ZipEntry binary_entry; ZipEntry binary_entry;
// Make sure the package opens correctly and its entry can be read. // Make sure the package opens correctly and its entry can be read.
ASSERT_EQ(0, FindEntry(handle, binary_path, &binary_entry)); ASSERT_EQ(0, FindEntry(handle, binary_path, &binary_entry));
TemporaryFile tmp_binary; TemporaryFile tmp_binary;
ASSERT_NE(-1, tmp_binary.fd); ASSERT_NE(-1, tmp_binary.fd);
ASSERT_EQ(0, ExtractEntryToFile(handle, &binary_entry, tmp_binary.fd)); ASSERT_EQ(0, ExtractEntryToFile(handle, &binary_entry, tmp_binary.fd));
sysReleaseMap(&map);
} }