diff options
Diffstat (limited to 'adservices/tests/cts/adid')
| -rw-r--r-- | adservices/tests/cts/adid/Android.bp | 8 | ||||
| -rw-r--r-- | adservices/tests/cts/adid/src/com/android/adservices/tests/adid/AdIdManagerTest.java | 15 |
2 files changed, 9 insertions, 14 deletions
diff --git a/adservices/tests/cts/adid/Android.bp b/adservices/tests/cts/adid/Android.bp index f06b1fc98a..eeb95fe642 100644 --- a/adservices/tests/cts/adid/Android.bp +++ b/adservices/tests/cts/adid/Android.bp @@ -36,7 +36,8 @@ android_test { test_suites: [ "cts", "general-tests", - "mts-adservices" + "mts-adservices", + "mcts-adservices", ], sdk_version: "module_current", min_sdk_version: "Tiramisu", @@ -63,11 +64,12 @@ android_test { test_suites: [ "cts", "general-tests", - "mts-extservices" + "mts-extservices", + "mcts-extservices", ], sdk_version: "module_current", min_sdk_version: "30", max_sdk_version: "32", test_config: "AndroidTest.ExtServices.xml", manifest: "AndroidManifestExtServices.xml", -} +}
\ No newline at end of file diff --git a/adservices/tests/cts/adid/src/com/android/adservices/tests/adid/AdIdManagerTest.java b/adservices/tests/cts/adid/src/com/android/adservices/tests/adid/AdIdManagerTest.java index 034688c6e7..3a5abc4c0e 100644 --- a/adservices/tests/cts/adid/src/com/android/adservices/tests/adid/AdIdManagerTest.java +++ b/adservices/tests/cts/adid/src/com/android/adservices/tests/adid/AdIdManagerTest.java @@ -17,8 +17,6 @@ package com.android.adservices.tests.adid; import static com.google.common.truth.Truth.assertWithMessage; -import static org.junit.Assert.fail; - import android.adservices.adid.AdId; import android.adservices.adid.AdIdManager; import android.os.LimitExceededException; @@ -162,19 +160,14 @@ public final class AdIdManagerTest extends CtsAdIdEndToEndTestCase { @Test @RequiresLowRamDevice - public void testAdIdManager_whenDeviceNotSupported_R() { + public void testAdIdManager_whenDeviceNotSupported_R() throws Exception { AdIdManager adIdManager = AdIdManager.get(sContext); assertWithMessage("adIdManager").that(adIdManager).isNotNull(); AdServicesOutcomeReceiverForTests<AdId> receiver = new AdServicesOutcomeReceiverForTests<>(); - // NOTE: cannot use assertThrows() as it would cause a NoSuchClassException on R (as - // JUnit somehow scans the whole class) - try { - adIdManager.getAdId(sCallbackExecutor, receiver); - fail("getAdId() should have thrown IllegalStateException"); - } catch (IllegalStateException e) { - // expected - } + + adIdManager.getAdId(sCallbackExecutor, receiver); + receiver.assertFailure(IllegalStateException.class); } private static String toString(AdId adId) { |