From 1e19cd613f6556c16a397bd630efe83d8edbea98 Mon Sep 17 00:00:00 2001 From: Mark Chien Date: Mon, 13 Jul 2020 02:30:59 +0000 Subject: [PATCH] Don't run testRequestLatestEntitlementResult if not supported If tethering is not supported, skip testRequestLatestEntitlementResult which test TetheringManager#requestLatestTetheringEntitlementResult API. Bug: 159869957 Test: atest CtsTetheringTest Merged-In: I65c32d5bc26f18f8c9d91593ab0c178e69e75c39 Change-Id: I65c32d5bc26f18f8c9d91593ab0c178e69e75c39 --- .../src/android/tethering/cts/TetheringManagerTest.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java b/tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java index 5e2f62787c..f47f4549c9 100644 --- a/tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java +++ b/tests/cts/tethering/src/android/tethering/cts/TetheringManagerTest.java @@ -697,6 +697,7 @@ public class TetheringManagerTest { @Test public void testRequestLatestEntitlementResult() throws Exception { + assumeTrue(mTM.isTetheringSupported()); // Verify that requestLatestTetheringEntitlementResult() can get entitlement // result(TETHER_ERROR_ENTITLEMENT_UNKNOWN due to invalid downstream type) via listener. assertEntitlementResult(listener -> mTM.requestLatestTetheringEntitlementResult( @@ -715,6 +716,9 @@ public class TetheringManagerTest { }, false), TETHER_ERROR_ENTITLEMENT_UNKNOWN); + // Do not request TETHERING_WIFI entitlement result if TETHERING_WIFI is not available. + assumeTrue(mTM.getTetherableWifiRegexs().length > 0); + // Verify that null listener will cause IllegalArgumentException. try { mTM.requestLatestTetheringEntitlementResult(