ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Added test for version check" am: 13af2f46a8 am: c36aa998a4

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2534111

Change-Id: Iad999b2745a2683412e5758bca32bb10243fee21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Daniel Zheng 2023-04-20 19:52:14 +00:00 • committed by Automerger Merge Worker
commit 76aa2000a7
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
fastboot/fastboot.h
View file

@ -133,6 +133,7 @@ void syntax_error(const char* fmt, ...);
std::string get_current_slot();
// Code for Parsing fastboot-info.txt
bool CheckFastbootInfoRequirements(const std::vector<std::string>& command);
std::unique_ptr<FlashTask> ParseFlashCommand(const FlashingPlan* fp,
const std::vector<std::string>& parts);
std::unique_ptr<RebootTask> ParseRebootCommand(const FlashingPlan* fp,

18
fastboot/task_test.cpp
View file

@ -80,3 +80,21 @@ TEST_F(ParseTest, CORRECT_FlASH_TASK_FORMED) {
ASSERT_EQ(task->GetImageName(), expected_values[i][3]);
}
}
TEST_F(ParseTest, VERSION_CHECK_CORRRECT) {
std::vector<std::string> correct_versions = {
"version 1.0",
"version 22.00",
};
std::vector<std::string> bad_versions = {"version", "version .01", "version x1",
"version 1.0.1", "version 1.", "s 1.0",
"version 1.0 2.0"};
for (auto& version : correct_versions) {
ASSERT_TRUE(CheckFastbootInfoRequirements(android::base::Split(version, " "))) << version;
}
for (auto& version : bad_versions) {
ASSERT_FALSE(CheckFastbootInfoRequirements(android::base::Split(version, " "))) << version;
}
}