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

Merge "Test: Don't check results when no type-c ports" am: 7e9eece7b3 am: 8cf1bf3f00 am: 9912848327

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

Change-Id: I616cbfd1e85406959b1b47358cdb75eeef92d030
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Dan Shi 2023-06-21 07:13:54 +00:00 committed by Automerger Merge Worker
commit 7b61e45b5d
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
usb/1.1/vts/functional/VtsHalUsbV1_1TargetTest.cpp
View file

@ -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,9 +166,12 @@ 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);
EXPECT_EQ(PortMode::NONE, res.args->usb_last_port_status.status.currentMode); // if there are no type-c ports, skip below checks
EXPECT_EQ(PortMode::NONE, res.args->usb_last_port_status.status.supportedModes); if (!res.args->usb_last_port_status.status.portName.empty()) {
EXPECT_EQ(Status::SUCCESS, res.args->usb_last_status); 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(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(