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

Test: Don't check results when no type-c ports

Browse Source 
For those devices without type-c ports, the queryPortStatus test is
always failed.Because there are no PortStatus for the callbacks.
Adding an additional condition branch to skip the results checking when
there are no PortStatus.

Bug: 281643316
(https://partnerissuetracker.corp.google.com/issues/281643316)
Signed-off-by: Haotien Hsu <haotienh@nvidia.com>
(cherry picked from https://android-review.googlesource.com/q/commit:392d530a649b709187fe8bf53512ef234051662f)
Merged-In: Ibf599038b542d5d81a2af9ab2097f2f868be0447
Change-Id: Ibf599038b542d5d81a2af9ab2097f2f868be0447
This commit is contained in:
Haotien Hsu
2023-05-08 18:46:14 +08:00
committed by Android Build Cherrypicker Worker
parent 55baee93d6
commit f3a68a04fc
1 changed files with 7 additions and 3 deletions
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 {
UsbClientCallbackArgs arg;
if (retval == Status::SUCCESS) {
arg.usb_last_port_status.status.portName = currentPortStatus[0].status.portName.c_str();
arg.usb_last_port_status.status.supportedModes =
currentPortStatus[0].status.supportedModes;
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);
EXPECT_TRUE(res.no_timeout);
EXPECT_EQ(2, res.args->last_usb_cookie);
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);
// 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.supportedModes);
EXPECT_EQ(Status::SUCCESS, res.args->usb_last_status);
}
}
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(UsbHidlTest);
INSTANTIATE_TEST_SUITE_P(