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

Commit 671d743f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Test: Don't check results when no type-c ports" into android13-tests-dev am: 6ec8db6a 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2635482



Change-Id: Ief8b7dcfb13a827b0546191ca681dc28c9802ec5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f88933b0 6ec8db6a

usb/1.1/vts/functional/VtsHalUsbV1_1TargetTest.cpp

+7 −3
Original line number Original line Diff line number Diff line
@@ -95,6 +95,7 @@ class UsbCallback : public ::testing::VtsHalHidlTargetCallbackBase<UsbClientCall 
                                            Status retval) override {

                                            Status retval) override {

        UsbClientCallbackArgs arg;

        UsbClientCallbackArgs arg;

        if (retval == Status::SUCCESS) {

        if (retval == Status::SUCCESS) {

            arg.usb_last_port_status.status.portName = currentPortStatus[0].status.portName.c_str();

            arg.usb_last_port_status.status.supportedModes =

            arg.usb_last_port_status.status.supportedModes =

                currentPortStatus[0].status.supportedModes;

                currentPortStatus[0].status.supportedModes;

            arg.usb_last_port_status.status.currentMode = currentPortStatus[0].status.currentMode;

            arg.usb_last_port_status.status.currentMode = currentPortStatus[0].status.currentMode;
@@ -165,10 +166,13 @@ TEST_P(UsbHidlTest, queryPortStatus) { 
    auto res = usb_cb_2->WaitForCallback(kCallbackNameNotifyPortStatusChange_1_1);

    auto res = usb_cb_2->WaitForCallback(kCallbackNameNotifyPortStatusChange_1_1);

    EXPECT_TRUE(res.no_timeout);

    EXPECT_TRUE(res.no_timeout);

    EXPECT_EQ(2, res.args->last_usb_cookie);

    EXPECT_EQ(2, res.args->last_usb_cookie);

    // if there are no type-c ports, skip below checks

    if (!res.args->usb_last_port_status.status.portName.empty()) {

        EXPECT_EQ(PortMode::NONE, res.args->usb_last_port_status.status.currentMode);

        EXPECT_EQ(PortMode::NONE, res.args->usb_last_port_status.status.currentMode);

        EXPECT_EQ(PortMode::NONE, res.args->usb_last_port_status.status.supportedModes);

        EXPECT_EQ(PortMode::NONE, res.args->usb_last_port_status.status.supportedModes);

        EXPECT_EQ(Status::SUCCESS, res.args->usb_last_status);

        EXPECT_EQ(Status::SUCCESS, res.args->usb_last_status);

    }

    }

}

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(UsbHidlTest);

GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(UsbHidlTest);

INSTANTIATE_TEST_SUITE_P(

INSTANTIATE_TEST_SUITE_P(

        PerInstance, UsbHidlTest,

        PerInstance, UsbHidlTest,