Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 22:04:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix bugs in boot HAL VTS test"

Browse Source
This commit is contained in:
Connor O'Brien
2017-01-13 19:07:11 +00:00
committed by Android (Google) Code Review
parent 4707e375d9 86a7ec303c
commit ac604f4708
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
boot/1.0/vts/functional/boot_hidl_hal_test.cpp
View File

@@ -35,18 +35,8 @@ using ::android::sp;
class BootHidlTest : public ::testing::Test {
public:
virtual void SetUp() override {
// TODO(b/33385836) Delete copied code
bool getStub = false;
char getsubProperty[PROPERTY_VALUE_MAX];
if (property_get("vts.hidl.get_stub", getsubProperty, "") > 0) {
if (!strcmp(getsubProperty, "true") || !strcmp(getsubProperty, "True") ||
!strcmp(getsubProperty, "1")) {
getStub = true;
}
}
boot = IBootControl::getService("bootctrl", getStub);
boot = IBootControl::getService("bootctrl");
ASSERT_NE(boot, nullptr);
ASSERT_EQ(!getStub, boot->isRemote());
}
virtual void TearDown() override {}
@@ -90,6 +80,13 @@ TEST_F(BootHidlTest, SetActiveBootSlot) {
Return<void> result = boot->setActiveBootSlot(s, generate_callback(&cr));
EXPECT_TRUE(result.isOk());
}
{
// Restore original flags to avoid problems on reboot
CommandResult cr;
Return <void> result = boot->markBootSuccessful(generate_callback(&cr));
EXPECT_TRUE(result.isOk());
EXPECT_TRUE(cr.success);
}
{
CommandResult cr;
uint32_t slots = boot->getNumberSlots();
@@ -111,7 +108,16 @@ TEST_F(BootHidlTest, SetSlotAsUnbootable) {
EXPECT_TRUE(result.isOk());
if (cr.success) {
EXPECT_EQ(BoolResult::FALSE, boot->isSlotBootable(otherSlot));
boot->setActiveBootSlot(otherSlot, generate_callback(&cr));
// Restore original flags to avoid problems on reboot
result = boot->setActiveBootSlot(otherSlot, generate_callback(&cr));
EXPECT_TRUE(result.isOk());
EXPECT_TRUE(cr.success);
result = boot->setActiveBootSlot(curSlot, generate_callback(&cr));
EXPECT_TRUE(result.isOk());
EXPECT_TRUE(cr.success);
result = boot->markBootSuccessful(generate_callback(&cr));
EXPECT_TRUE(result.isOk());
EXPECT_TRUE(cr.success);
}
}