tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix boot VTS GetSuffix test" am: 5cd16a71f5

Browse source 
am: 9485e78b93

Change-Id: I7db2fec0f125c6ddc3bdad678bfa34c913f8dacc
This commit is contained in:
Connor O'Brien 2018-02-24 18:39:36 +00:00 committed by android-build-merger
commit 0a7184563e
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
boot/1.0/vts/functional/VtsHalBootV1_0TargetTest.cpp
View file

@ -24,6 +24,8 @@
#include <VtsHalHidlTargetTestBase.h>
#include <VtsHalHidlTargetTestEnvBase.h>
#include <unordered_set>
using ::android::hardware::boot::V1_0::IBootControl;
using ::android::hardware::boot::V1_0::CommandResult;
using ::android::hardware::boot::V1_0::BoolResult;
@ -32,6 +34,7 @@ using ::android::hardware::hidl_string;
using ::android::hardware::Return;
using ::android::sp;
using std::string;
using std::unordered_set;
using std::vector;
// Test environment for Boot HIDL HAL.
@ -168,14 +171,18 @@ TEST_F(BootHidlTest, IsSlotMarkedSuccessful) {
// Sanity check Boot::getSuffix() on good and bad inputs.
TEST_F(BootHidlTest, GetSuffix) {
string suffixStr;
vector<string> correctSuffixes = {"_a", "_b"};
unordered_set<string> suffixes;
auto cb = [&](hidl_string suffix) { suffixStr = suffix.c_str(); };
for (Slot i = 0; i < 2; i++) {
for (Slot i = 0; i < boot->getNumberSlots(); i++) {
CommandResult cr;
Return<void> result = boot->getSuffix(i, cb);
EXPECT_TRUE(result.isOk());
ASSERT_EQ(0, suffixStr.compare(correctSuffixes[i]));
ASSERT_EQ('_', suffixStr[0]);
ASSERT_LE((unsigned)2, suffixStr.size());
suffixes.insert(suffixStr);
}
// All suffixes should be unique
ASSERT_EQ(boot->getNumberSlots(), suffixes.size());
{
string emptySuffix = "";
Return<void> result = boot->getSuffix(boot->getNumberSlots(), cb);