Merge "Don't run testRequestLatestEntitlementResult if not supported" am: 1129c316fd am: 793308371d am: cf750de87c am: 85d28e4d00

Original change: https://android-review.googlesource.com/c/platform/cts/+/1352284

Change-Id: I31b6e621bfa7682f1966373fb92b003135545f07
This commit is contained in:
Mark Chien
2020-07-13 02:40:44 +00:00
committed by Automerger Merge Worker

View File

@@ -697,6 +697,7 @@ public class TetheringManagerTest {
@Test @Test
public void testRequestLatestEntitlementResult() throws Exception { public void testRequestLatestEntitlementResult() throws Exception {
assumeTrue(mTM.isTetheringSupported());
// Verify that requestLatestTetheringEntitlementResult() can get entitlement // Verify that requestLatestTetheringEntitlementResult() can get entitlement
// result(TETHER_ERROR_ENTITLEMENT_UNKNOWN due to invalid downstream type) via listener. // result(TETHER_ERROR_ENTITLEMENT_UNKNOWN due to invalid downstream type) via listener.
assertEntitlementResult(listener -> mTM.requestLatestTetheringEntitlementResult( assertEntitlementResult(listener -> mTM.requestLatestTetheringEntitlementResult(
@@ -715,6 +716,9 @@ public class TetheringManagerTest {
}, false), }, false),
TETHER_ERROR_ENTITLEMENT_UNKNOWN); 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. // Verify that null listener will cause IllegalArgumentException.
try { try {
mTM.requestLatestTetheringEntitlementResult( mTM.requestLatestTetheringEntitlementResult(