Merge "Added test for parsing bad input" am: cf1ca03836
am: 104348c545
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2536490 Change-Id: I5982511a3a59074a535b60501c81258ecf2f0815 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
c146c47404
1 changed files with 24 additions and 1 deletions
|
@ -53,6 +53,11 @@ static std::vector<std::unique_ptr<Task>> collectTasks(FlashingPlan* fp,
|
|||
return tasks;
|
||||
}
|
||||
|
||||
std::unique_ptr<Task> ParseCommand(FlashingPlan* fp, std::string command) {
|
||||
std::vector<std::string> vec_command = android::base::Split(command, " ");
|
||||
return ParseFastbootInfoLine(fp, vec_command);
|
||||
}
|
||||
|
||||
TEST_F(ParseTest, CORRECT_FlASH_TASK_FORMED) {
|
||||
std::vector<std::string> commands = {"flash dtbo", "flash --slot-other system system_other.img",
|
||||
"flash system", "flash --apply-vbmeta vbmeta"};
|
||||
|
@ -97,4 +102,22 @@ TEST_F(ParseTest, VERSION_CHECK_CORRRECT) {
|
|||
for (auto& version : bad_versions) {
|
||||
ASSERT_FALSE(CheckFastbootInfoRequirements(android::base::Split(version, " "))) << version;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
TEST_F(ParseTest, BAD_FASTBOOT_INFO_INPUT) {
|
||||
ASSERT_EQ(ParseCommand(fp.get(), "flash"), nullptr);
|
||||
ASSERT_EQ(ParseCommand(fp.get(), "flash --slot-other --apply-vbmeta"), nullptr);
|
||||
ASSERT_EQ(ParseCommand(fp.get(), "flash --apply-vbmeta"), nullptr);
|
||||
ASSERT_EQ(ParseCommand(fp.get(), "if-wipe"), nullptr);
|
||||
ASSERT_EQ(ParseCommand(fp.get(), "if-wipe flash"), nullptr);
|
||||
ASSERT_EQ(ParseCommand(fp.get(), "wipe dtbo"), nullptr);
|
||||
ASSERT_EQ(ParseCommand(fp.get(), "update-super dtbo"), nullptr);
|
||||
ASSERT_EQ(ParseCommand(fp.get(), "flash system system.img system"), nullptr);
|
||||
ASSERT_EQ(ParseCommand(fp.get(), "reboot bootloader fastboot"), nullptr);
|
||||
ASSERT_EQ(ParseCommand(fp.get(),
|
||||
"flash --slot-other --apply-vbmeta system system_other.img system"),
|
||||
nullptr);
|
||||
ASSERT_EQ(ParseCommand(fp.get(), "erase"), nullptr);
|
||||
ASSERT_EQ(ParseCommand(fp.get(), "erase dtbo dtbo"), nullptr);
|
||||
ASSERT_EQ(ParseCommand(fp.get(), "wipe this"), nullptr);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue