diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-07 01:30:17 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-07 01:30:17 +0000 |
commit | 42bc2f314f71eacea2351666fe2b51f0619c5afa (patch) | |
tree | f264df50590f77c449e824681d5f9626e9364ea4 | |
parent | 0b9161854d20f962ac524dabe5b14b5b5401449e (diff) | |
parent | a66a1658a3ff50f03f8d96f4f987bd9d8eb1bab6 (diff) | |
download | hal-android13-qpr1-s6-release.tar.gz |
Snap for 8688137 from a66a1658a3ff50f03f8d96f4f987bd9d8eb1bab6 to tm-qpr1-releaseandroid-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16android13-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-release
Change-Id: I67b649661c320329dfc5289bfdd7ec9c748c0da9
-rw-r--r-- | usb/usb/aidl/host/src/com/android/usb/vts/VtsAidlUsbHostTest.java | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/usb/usb/aidl/host/src/com/android/usb/vts/VtsAidlUsbHostTest.java b/usb/usb/aidl/host/src/com/android/usb/vts/VtsAidlUsbHostTest.java index 1a2e0b3f..d62ff6c2 100644 --- a/usb/usb/aidl/host/src/com/android/usb/vts/VtsAidlUsbHostTest.java +++ b/usb/usb/aidl/host/src/com/android/usb/vts/VtsAidlUsbHostTest.java @@ -19,9 +19,14 @@ package com.android.tests.usbport; import com.android.tradefed.device.DeviceNotAvailableException; import com.android.tradefed.device.ITestDevice; import com.android.tradefed.log.LogUtil.CLog; +import com.android.tradefed.invoker.TestInformation; import com.android.tradefed.testtype.DeviceJUnit4ClassRunner; import com.android.tradefed.testtype.junit4.BaseHostJUnit4Test; +import com.android.tradefed.testtype.junit4.BeforeClassWithInfo; +import com.google.common.base.Strings; +import java.util.Arrays; +import java.util.HashSet; import java.util.concurrent.atomic.AtomicBoolean; import org.junit.Assert; @@ -34,8 +39,11 @@ import org.junit.runner.RunWith; public final class VtsAidlUsbHostTest extends BaseHostJUnit4Test { public static final String TAG = VtsAidlUsbHostTest.class.getSimpleName(); + private static final String HAL_SERVICE = "android.hardware.usb-service"; private static final long CONN_TIMEOUT = 5000; + private static boolean mHasService; + private ITestDevice mDevice; private AtomicBoolean mReconnected = new AtomicBoolean(false); @@ -44,13 +52,26 @@ public final class VtsAidlUsbHostTest extends BaseHostJUnit4Test { mDevice = getDevice(); } + @BeforeClassWithInfo + public static void beforeClassWithDevice(TestInformation testInfo) throws Exception { + String serviceFound = + testInfo.getDevice() + .executeShellCommand(String.format("ps -A | grep \"%s\"", HAL_SERVICE)) + .trim(); + mHasService = !Strings.isNullOrEmpty(serviceFound); + } + @Test public void testResetUsbPort() throws Exception { + Assume.assumeTrue( + String.format("The device doesn't have service %s", HAL_SERVICE), mHasService); Assert.assertNotNull("Target device does not exist", mDevice); - String portResult; - + String portResult, content; String deviceSerialNumber = mDevice.getSerialNumber(); + HashSet<String> noSupportCases = + new HashSet<>(Arrays.asList("No USB ports", + "There is no available reset USB port")); CLog.i("testResetUsbPort on device [%s]", deviceSerialNumber); @@ -74,8 +95,9 @@ public final class VtsAidlUsbHostTest extends BaseHostJUnit4Test { CLog.i("Invoke shell command [" + cmd + "]"); long startTime = System.currentTimeMillis(); portResult = mDevice.executeShellCommand(cmd); + content = portResult.trim(); - if (portResult != null && "No USB ports".equals(portResult.trim())) { + if (portResult != null && (noSupportCases.contains(content))) { CLog.i("portResult: %s", portResult); return; } |