diff options
author | Tao Bao <tbao@google.com> | 2016-11-16 06:27:27 +0100 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 06:27:27 +0100 |
commit | 7e3d156b86b816588379484640f32b66f5bfe4c8 (patch) | |
tree | 65410f83e121df55cbdec80e9b2f746096810cf7 /tests | |
parent | Merge "Add .clang-format style file." am: b76960c984 am: 1f0af0c2ea (diff) | |
parent | updater: Fix the wrong return value for package_extract_file(). (diff) | |
download | android_bootable_recovery-7e3d156b86b816588379484640f32b66f5bfe4c8.tar android_bootable_recovery-7e3d156b86b816588379484640f32b66f5bfe4c8.tar.gz android_bootable_recovery-7e3d156b86b816588379484640f32b66f5bfe4c8.tar.bz2 android_bootable_recovery-7e3d156b86b816588379484640f32b66f5bfe4c8.tar.lz android_bootable_recovery-7e3d156b86b816588379484640f32b66f5bfe4c8.tar.xz android_bootable_recovery-7e3d156b86b816588379484640f32b66f5bfe4c8.tar.zst android_bootable_recovery-7e3d156b86b816588379484640f32b66f5bfe4c8.zip |
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Android.mk | 2 | ||||
-rw-r--r-- | tests/common/test_constants.h | 9 | ||||
-rw-r--r-- | tests/component/updater_test.cpp | 92 | ||||
-rw-r--r-- | tests/unit/zip_test.cpp | 3 |
4 files changed, 86 insertions, 20 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index e87a22964..fdc947028 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -92,6 +92,8 @@ LOCAL_STATIC_LIBRARIES := \ libcrypto \ libcutils \ libbz \ + libziparchive \ + libutils \ libz \ libbase \ libtune2fs \ diff --git a/tests/common/test_constants.h b/tests/common/test_constants.h index 97e74a3c2..93e4ab5b2 100644 --- a/tests/common/test_constants.h +++ b/tests/common/test_constants.h @@ -19,6 +19,15 @@ #include <stdlib.h> +// Zip entries in ziptest_valid.zip. +static const std::string kATxtContents("abcdefghabcdefgh\n"); +static const std::string kBTxtContents("abcdefgh\n"); + +// echo -n -e "abcdefghabcdefgh\n" | sha1sum +static const std::string kATxtSha1Sum("32c96a03dc8cd20097940f351bca6261ee5a1643"); +// echo -n -e "abcdefgh\n" | sha1sum +static const std::string kBTxtSha1Sum("e414af7161c9554089f4106d6f1797ef14a73666"); + static const char* data_root = getenv("ANDROID_DATA"); static std::string from_testdata_base(const std::string& fname) { diff --git a/tests/component/updater_test.cpp b/tests/component/updater_test.cpp index 973c19de3..a029cf449 100644 --- a/tests/component/updater_test.cpp +++ b/tests/component/updater_test.cpp @@ -24,35 +24,40 @@ #include <android-base/properties.h> #include <android-base/test_utils.h> #include <gtest/gtest.h> +#include <ziparchive/zip_archive.h> +#include "common/test_constants.h" #include "edify/expr.h" #include "error_code.h" #include "updater/install.h" +#include "updater/updater.h" struct selabel_handle *sehandle = nullptr; -static void expect(const char* expected, const char* expr_str, CauseCode cause_code) { - Expr* e; - int error_count; - EXPECT_EQ(parse_string(expr_str, &e, &error_count), 0); +static void expect(const char* expected, const char* expr_str, CauseCode cause_code, + UpdaterInfo* info = nullptr) { + Expr* e; + int error_count = 0; + ASSERT_EQ(0, parse_string(expr_str, &e, &error_count)); + ASSERT_EQ(0, error_count); - State state(expr_str, nullptr); + State state(expr_str, info); - std::string result; - bool status = Evaluate(&state, e, &result); + std::string result; + bool status = Evaluate(&state, e, &result); - if (expected == nullptr) { - EXPECT_FALSE(status); - } else { - EXPECT_STREQ(expected, result.c_str()); - } - - // Error code is set in updater/updater.cpp only, by parsing State.errmsg. - EXPECT_EQ(kNoError, state.error_code); + if (expected == nullptr) { + ASSERT_FALSE(status); + } else { + ASSERT_TRUE(status); + ASSERT_STREQ(expected, result.c_str()); + } - // Cause code should always be available. - EXPECT_EQ(cause_code, state.cause_code); + // Error code is set in updater/updater.cpp only, by parsing State.errmsg. + ASSERT_EQ(kNoError, state.error_code); + // Cause code should always be available. + ASSERT_EQ(cause_code, state.cause_code); } class UpdaterTest : public ::testing::Test { @@ -264,3 +269,56 @@ TEST_F(UpdaterTest, symlink) { ASSERT_EQ(0, unlink(src1.c_str())); ASSERT_EQ(0, unlink(src2.c_str())); } + +// TODO: Test extracting to block device. +TEST_F(UpdaterTest, package_extract_file) { + // package_extract_file expects 1 or 2 arguments. + expect(nullptr, "package_extract_file()", kArgsParsingFailure); + expect(nullptr, "package_extract_file(\"arg1\", \"arg2\", \"arg3\")", kArgsParsingFailure); + + std::string zip_path = from_testdata_base("ziptest_valid.zip"); + ZipArchiveHandle handle; + ASSERT_EQ(0, OpenArchive(zip_path.c_str(), &handle)); + + // Need to set up the ziphandle. + UpdaterInfo updater_info; + updater_info.package_zip = handle; + + // Two-argument version. + TemporaryFile temp_file1; + std::string script("package_extract_file(\"a.txt\", \"" + std::string(temp_file1.path) + "\")"); + expect("t", script.c_str(), kNoCause, &updater_info); + + // Verify the extracted entry. + std::string data; + ASSERT_TRUE(android::base::ReadFileToString(temp_file1.path, &data)); + ASSERT_EQ(kATxtContents, data); + + // Now extract another entry to the same location, which should overwrite. + script = "package_extract_file(\"b.txt\", \"" + std::string(temp_file1.path) + "\")"; + expect("t", script.c_str(), kNoCause, &updater_info); + + ASSERT_TRUE(android::base::ReadFileToString(temp_file1.path, &data)); + ASSERT_EQ(kBTxtContents, data); + + // Missing zip entry. The two-argument version doesn't abort. + script = "package_extract_file(\"doesntexist\", \"" + std::string(temp_file1.path) + "\")"; + expect("", script.c_str(), kNoCause, &updater_info); + + // Extract to /dev/full should fail. + script = "package_extract_file(\"a.txt\", \"/dev/full\")"; + expect("", script.c_str(), kNoCause, &updater_info); + + // One-argument version. + script = "sha1_check(package_extract_file(\"a.txt\"))"; + expect(kATxtSha1Sum.c_str(), script.c_str(), kNoCause, &updater_info); + + script = "sha1_check(package_extract_file(\"b.txt\"))"; + expect(kBTxtSha1Sum.c_str(), script.c_str(), kNoCause, &updater_info); + + // Missing entry. The one-argument version aborts the evaluation. + script = "package_extract_file(\"doesntexist\")"; + expect(nullptr, script.c_str(), kPackageExtractFileFailure, &updater_info); + + CloseArchive(handle); +} diff --git a/tests/unit/zip_test.cpp b/tests/unit/zip_test.cpp index 49729467d..ef0ee4c1d 100644 --- a/tests/unit/zip_test.cpp +++ b/tests/unit/zip_test.cpp @@ -30,9 +30,6 @@ #include "common/test_constants.h" -static const std::string kATxtContents("abcdefghabcdefgh\n"); -static const std::string kBTxtContents("abcdefgh\n"); - TEST(ZipTest, ExtractPackageRecursive) { std::string zip_path = from_testdata_base("ziptest_valid.zip"); ZipArchiveHandle handle; |