diff options
| author | Tianjie Xu <xunchang@google.com> | 2019-03-15 19:03:07 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-15 19:03:07 +0100 |
| commit | 8a9a4a1e0582b5b99e9e8b2c3d7443000de78826 (patch) | |
| tree | 3417ec3d003d01cdbe69a5ab876f591602baf4a9 /tests/component/verifier_test.cpp | |
| parent | Merge "Start charger at /system/bin/charger." am: d5bbec7750 (diff) | |
| parent | Merge "Implement FilePackage class" (diff) | |
| download | android_bootable_recovery-8a9a4a1e0582b5b99e9e8b2c3d7443000de78826.tar android_bootable_recovery-8a9a4a1e0582b5b99e9e8b2c3d7443000de78826.tar.gz android_bootable_recovery-8a9a4a1e0582b5b99e9e8b2c3d7443000de78826.tar.bz2 android_bootable_recovery-8a9a4a1e0582b5b99e9e8b2c3d7443000de78826.tar.lz android_bootable_recovery-8a9a4a1e0582b5b99e9e8b2c3d7443000de78826.tar.xz android_bootable_recovery-8a9a4a1e0582b5b99e9e8b2c3d7443000de78826.tar.zst android_bootable_recovery-8a9a4a1e0582b5b99e9e8b2c3d7443000de78826.zip | |
Diffstat (limited to 'tests/component/verifier_test.cpp')
| -rw-r--r-- | tests/component/verifier_test.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/tests/component/verifier_test.cpp b/tests/component/verifier_test.cpp index c26d76d73..c904cd038 100644 --- a/tests/component/verifier_test.cpp +++ b/tests/component/verifier_test.cpp @@ -240,8 +240,10 @@ class VerifierTest : public testing::TestWithParam<std::vector<std::string>> { void SetUp() override { std::vector<std::string> args = GetParam(); std::string path = from_testdata_base(args[0]); - package_ = Package::CreateMemoryPackage(path, nullptr); - ASSERT_NE(nullptr, package_); + memory_package_ = Package::CreateMemoryPackage(path, nullptr); + ASSERT_NE(nullptr, memory_package_); + file_package_ = Package::CreateFilePackage(path, nullptr); + ASSERT_NE(nullptr, file_package_); for (auto it = ++args.cbegin(); it != args.cend(); ++it) { std::string public_key_file = from_testdata_base("testkey_" + *it + ".x509.pem"); @@ -250,7 +252,8 @@ class VerifierTest : public testing::TestWithParam<std::vector<std::string>> { } } - std::unique_ptr<Package> package_; + std::unique_ptr<Package> memory_package_; + std::unique_ptr<Package> file_package_; std::vector<Certificate> certs_; }; @@ -304,11 +307,13 @@ TEST(VerifierTest, BadPackage_SignatureStartOutOfBounds) { } TEST_P(VerifierSuccessTest, VerifySucceed) { - ASSERT_EQ(VERIFY_SUCCESS, verify_file(package_.get(), certs_)); + ASSERT_EQ(VERIFY_SUCCESS, verify_file(memory_package_.get(), certs_)); + ASSERT_EQ(VERIFY_SUCCESS, verify_file(file_package_.get(), certs_)); } TEST_P(VerifierFailureTest, VerifyFailure) { - ASSERT_EQ(VERIFY_FAILURE, verify_file(package_.get(), certs_)); + ASSERT_EQ(VERIFY_FAILURE, verify_file(memory_package_.get(), certs_)); + ASSERT_EQ(VERIFY_FAILURE, verify_file(file_package_.get(), certs_)); } INSTANTIATE_TEST_CASE_P(SingleKeySuccess, VerifierSuccessTest, |