diff options
| author | Haotien Hsu <haotienh@nvidia.com> | 2023-05-08 18:46:14 +0800 |
|---|---|---|
| committer | Android Build Cherrypicker Worker <android-build-cherrypicker-worker@google.com> | 2023-06-22 20:15:45 +0000 |
| commit | f3a68a04fcd2e186ac1c4d19cc337a4659e1696a (patch) | |
| tree | 7cd4600caeb527cc34458de617519adbb66f0c08 | |
| parent | 55baee93d61d7b4955af2ac9420f56d613edd163 (diff) | |
| download | interfaces-f3a68a04fcd2e186ac1c4d19cc337a4659e1696a.tar.gz | |
Test: Don't check results when no type-c ports
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
| -rw-r--r-- | usb/1.1/vts/functional/VtsHalUsbV1_1TargetTest.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/usb/1.1/vts/functional/VtsHalUsbV1_1TargetTest.cpp b/usb/1.1/vts/functional/VtsHalUsbV1_1TargetTest.cpp index 19830a6b8a..0883de2349 100644 --- a/usb/1.1/vts/functional/VtsHalUsbV1_1TargetTest.cpp +++ b/usb/1.1/vts/functional/VtsHalUsbV1_1TargetTest.cpp @@ -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( |