Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb88422d authored by Connor O'Brien's avatar Connor O'Brien
Browse files

Fix hidl_string copy in boot VTS test 



hidl_strings returned through a callback need to be copied; the
current approach just saves a pointer to the underlying buffer, which
is incorrect and sometimes causes the test to fail.

Test: the GetSuffix test now passes reliably
Change-Id: I4bb143be98b00b20f9da4aebef3b5ab4980b7690
Signed-off-by: default avatarConnor O'Brien <connoro@google.com>
parent ae880e49

boot/1.0/vts/functional/VtsHalBootV1_0TargetTest.cpp

+18 −17
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ using ::android::hardware::boot::V1_0::Slot; 
using ::android::hardware::hidl_string;

using ::android::hardware::Return;

using ::android::sp;

using std::string;

using std::vector;



// The main test class for the Boot HIDL HAL.

class BootHidlTest : public ::testing::VtsHalHidlTargetTestBase {
@@ -151,21 +153,20 @@ TEST_F(BootHidlTest, IsSlotMarkedSuccessful) { 


// Sanity check Boot::getSuffix() on good and bad inputs.

TEST_F(BootHidlTest, GetSuffix) {

  const char *suffixPtr;

  auto cb = [&](hidl_string suffix) { suffixPtr = suffix.c_str(); };

    string suffixStr;

    vector<string> correctSuffixes = {"_a", "_b"};

    auto cb = [&](hidl_string suffix) { suffixStr = suffix.c_str(); };

    for (Slot i = 0; i < 2; i++) {

        CommandResult cr;

        Return<void> result = boot->getSuffix(i, cb);

        EXPECT_TRUE(result.isOk());

    char correctSuffix[3];

    snprintf(correctSuffix, sizeof(correctSuffix), "_%c", 'a' + i);

    ASSERT_EQ(0, strcmp(suffixPtr, correctSuffix));

        ASSERT_EQ(0, suffixStr.compare(correctSuffixes[i]));

    }

    {

    char emptySuffix[] = "";

        string emptySuffix = "";

        Return<void> result = boot->getSuffix(boot->getNumberSlots(), cb);

        EXPECT_TRUE(result.isOk());

    ASSERT_EQ(0, strcmp(emptySuffix, suffixPtr));

        ASSERT_EQ(0, suffixStr.compare(emptySuffix));

    }

}