summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorxunchang <xunchang@google.com>2019-03-13 22:21:48 +0100
committerxunchang <xunchang@google.com>2019-03-13 23:24:13 +0100
commitaaa6103ae72985d061432745e668df9ca29d6ac2 (patch)
tree58850604aff1c043e0097f82505e9aaba82b2c3a /tests
parentMerge "Use the package class for wipe packages" (diff)
downloadandroid_bootable_recovery-aaa6103ae72985d061432745e668df9ca29d6ac2.tar
android_bootable_recovery-aaa6103ae72985d061432745e668df9ca29d6ac2.tar.gz
android_bootable_recovery-aaa6103ae72985d061432745e668df9ca29d6ac2.tar.bz2
android_bootable_recovery-aaa6103ae72985d061432745e668df9ca29d6ac2.tar.lz
android_bootable_recovery-aaa6103ae72985d061432745e668df9ca29d6ac2.tar.xz
android_bootable_recovery-aaa6103ae72985d061432745e668df9ca29d6ac2.tar.zst
android_bootable_recovery-aaa6103ae72985d061432745e668df9ca29d6ac2.zip
Diffstat (limited to 'tests')
-rw-r--r--tests/component/update_verifier_test.cpp44
1 files changed, 3 insertions, 41 deletions
diff --git a/tests/component/update_verifier_test.cpp b/tests/component/update_verifier_test.cpp
index 0a594037c..e27e58c22 100644
--- a/tests/component/update_verifier_test.cpp
+++ b/tests/component/update_verifier_test.cpp
@@ -98,7 +98,7 @@ TEST_F(UpdateVerifierTest, verify_image_no_care_map) {
ASSERT_FALSE(verifier_.ParseCareMap());
}
-TEST_F(UpdateVerifierTest, verify_image_smoke) {
+TEST_F(UpdateVerifierTest, verify_image_text_format) {
// This test relies on dm-verity support.
if (!verity_supported) {
GTEST_LOG_(INFO) << "Test skipped on devices without dm-verity support.";
@@ -107,49 +107,11 @@ TEST_F(UpdateVerifierTest, verify_image_smoke) {
std::string content = "system\n2,0,1";
ASSERT_TRUE(android::base::WriteStringToFile(content, care_map_txt_));
- ASSERT_TRUE(verifier_.ParseCareMap());
- ASSERT_TRUE(verifier_.VerifyPartitions());
-
- // Leading and trailing newlines should be accepted.
- ASSERT_TRUE(android::base::WriteStringToFile("\n" + content + "\n\n", care_map_txt_));
- ASSERT_TRUE(verifier_.ParseCareMap());
- ASSERT_TRUE(verifier_.VerifyPartitions());
-}
-
-TEST_F(UpdateVerifierTest, verify_image_empty_care_map) {
+ // CareMap in text format is no longer supported.
ASSERT_FALSE(verifier_.ParseCareMap());
}
-TEST_F(UpdateVerifierTest, verify_image_wrong_lines) {
- // The care map file can have only 2 / 4 / 6 lines.
- ASSERT_TRUE(android::base::WriteStringToFile("line1", care_map_txt_));
- ASSERT_FALSE(verifier_.ParseCareMap());
-
- ASSERT_TRUE(android::base::WriteStringToFile("line1\nline2\nline3", care_map_txt_));
- ASSERT_FALSE(verifier_.ParseCareMap());
-}
-
-TEST_F(UpdateVerifierTest, verify_image_malformed_care_map) {
- // This test relies on dm-verity support.
- if (!verity_supported) {
- GTEST_LOG_(INFO) << "Test skipped on devices without dm-verity support.";
- return;
- }
-
- std::string content = "system\n2,1,0";
- ASSERT_TRUE(android::base::WriteStringToFile(content, care_map_txt_));
- ASSERT_FALSE(verifier_.ParseCareMap());
-}
-
-TEST_F(UpdateVerifierTest, verify_image_legacy_care_map) {
- // This test relies on dm-verity support.
- if (!verity_supported) {
- GTEST_LOG_(INFO) << "Test skipped on devices without dm-verity support.";
- return;
- }
-
- std::string content = "/dev/block/bootdevice/by-name/system\n2,1,0";
- ASSERT_TRUE(android::base::WriteStringToFile(content, care_map_txt_));
+TEST_F(UpdateVerifierTest, verify_image_empty_care_map) {
ASSERT_FALSE(verifier_.ParseCareMap());
}