diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-01-10 19:01:23 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-01-10 19:01:23 +0000 |
commit | 41e7bbcf3d375486769059090e15260dc92f16c7 (patch) | |
tree | 5c368873297b82c25a8ba866cbeda97cce94d9fc /adservices/tests/cts/adid | |
parent | 4f73884441d6a5c6ba4af7e5026807822aa034a0 (diff) | |
parent | 7f6cf1d740d6f047507d8bd2bc07ab12496e8024 (diff) | |
download | AdServices-aml_tz5_341510010.tar.gz |
Snap for 11296156 from 7f6cf1d740d6f047507d8bd2bc07ab12496e8024 to mainline-tzdata5-releaseaml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz5_341510010
Change-Id: I84e6c0df7ccbfafbe8dd398518474c2b7a676013
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) { |