diff options
| author | George Verhaegen <verhaegen@google.com> | 2024-03-15 16:44:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-15 16:44:38 +0000 |
| commit | 0af4df0768f16f29c3176867a7f9dc9c8a6f7f40 (patch) | |
| tree | 765d093892c7e8886f36eedd9f6141a1020dc0ef | |
| parent | bcffa9f07869a114b0c7e85733db3c6deb8b37cf (diff) | |
| parent | 2dab4391208ad36c38b4966a3ecf8541b340d72d (diff) | |
| download | AdServices-0af4df0768f16f29c3176867a7f9dc9c8a6f7f40.tar.gz | |
Merge "RESTRICT AUTOMERGE Revert "Modify testTopicsManager_testTopicsKillSwitch to expect ..."" into android14-tests-dev
| -rw-r--r-- | adservices/tests/cts/endtoends/topics/Android.bp | 4 | ||||
| -rw-r--r-- | adservices/tests/cts/endtoends/topics/src/com/android/adservices/tests/cts/topics/TopicsManagerTest.java | 12 |
2 files changed, 6 insertions, 10 deletions
diff --git a/adservices/tests/cts/endtoends/topics/Android.bp b/adservices/tests/cts/endtoends/topics/Android.bp index 34b5147861..43a1b9945f 100644 --- a/adservices/tests/cts/endtoends/topics/Android.bp +++ b/adservices/tests/cts/endtoends/topics/Android.bp @@ -27,7 +27,6 @@ java_defaults { "truth-prebuilt", "adservices-clients", "adservices-test-utility", - "framework-adservices-lib", ], libs: [ "android.test.base", @@ -43,8 +42,7 @@ android_test { test_suites: [ "cts", "general-tests", - "mts-adservices", - "mcts-adservices" + "mts-adservices" ], min_sdk_version: "Tiramisu", manifest: "CtsAdServicesEndToEndTestsManifest.xml", diff --git a/adservices/tests/cts/endtoends/topics/src/com/android/adservices/tests/cts/topics/TopicsManagerTest.java b/adservices/tests/cts/endtoends/topics/src/com/android/adservices/tests/cts/topics/TopicsManagerTest.java index 3456e0b18c..2dbeae09bf 100644 --- a/adservices/tests/cts/endtoends/topics/src/com/android/adservices/tests/cts/topics/TopicsManagerTest.java +++ b/adservices/tests/cts/endtoends/topics/src/com/android/adservices/tests/cts/topics/TopicsManagerTest.java @@ -146,13 +146,11 @@ public class TopicsManagerTest { // As the kill switch for Topics API is enabled, we should expect failure here. assertThat( - assertThrows( - ExecutionException.class, - () -> advertisingTopicsClient.getTopics().get()) - .getMessage()) - .isEqualTo( - "com.android.adservices.shared.common.ServiceUnavailableException: Service" - + " is not available."); + assertThrows( + ExecutionException.class, + () -> advertisingTopicsClient.getTopics().get()) + .getMessage()) + .isEqualTo("java.lang.IllegalStateException: Service is not available."); // Override Topics kill switch to enable Topics API. overrideTopicsKillSwitch(false); |