disable link test on S + add ApkUITests to presubmit
Bug: 274978520
Test: ABTD
Change-Id: I8f85c09da90e10e8b025200387b73d8b48fc9a76
diff --git a/adservices/TEST_MAPPING b/adservices/TEST_MAPPING
index aa1357e..9f8d0f6 100644
--- a/adservices/TEST_MAPPING
+++ b/adservices/TEST_MAPPING
@@ -5,10 +5,18 @@
"name": "AdServicesApkUITests[com.google.android.adservices.apex]"
},
{
+ // Install com.google.android.extservices.apex and run AdExtServicesApkUITests.
+ "name": "AdExtServicesApkUITests[com.google.android.extservices.apex]"
+ },
+ {
// Install com.google.android.adservices.apex and run AdServicesApkUITestsAppConsent.
"name": "AdServicesApkUITestsAppConsent[com.google.android.adservices.apex]"
},
{
+ // Install com.google.android.extservices.apex and run AdExtServicesApkUITestsAppConsent.
+ "name": "AdExtServicesApkUITestsAppConsent[com.google.android.extservices.apex]"
+ },
+ {
// Install com.google.android.adservices.apex and run AdServicesApkUnitTests.
"name": "AdServicesApkUnitTests[com.google.android.adservices.apex]"
},
@@ -186,11 +194,11 @@
{
"name": "AdServicesApkUITests",
"options": [
- {
- // Exclude tests that are marked flaky
- "exclude-annotation": "androidx.test.filters.FlakyTest"
- }
- ]
+ {
+ // Exclude tests that are marked flaky
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
},
{
"name": "AdServicesApkUITestsAppConsent"
@@ -210,20 +218,20 @@
{
"name": "CtsAppSetIdEndToEndTest",
"options": [
- {
- // Exclude tests that are marked flaky
- "exclude-annotation": "androidx.test.filters.FlakyTest"
- }
- ]
+ {
+ // Exclude tests that are marked flaky
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
},
{
"name": "CtsRootAdServicesUiTest",
"options": [
- {
- // Exclude tests that are marked flaky
- "exclude-annotation": "androidx.test.filters.FlakyTest"
- }
- ]
+ {
+ // Exclude tests that are marked flaky
+ "exclude-annotation": "androidx.test.filters.FlakyTest"
+ }
+ ]
},
{
"name": "CtsAdServicesHostTests"
diff --git a/adservices/apk/tests/src/com/android/adservices/ui/notifications/NotificationActivityUiAutomatorTest.java b/adservices/apk/tests/src/com/android/adservices/ui/notifications/NotificationActivityUiAutomatorTest.java
index bdc7aca..4dc6c4c 100644
--- a/adservices/apk/tests/src/com/android/adservices/ui/notifications/NotificationActivityUiAutomatorTest.java
+++ b/adservices/apk/tests/src/com/android/adservices/ui/notifications/NotificationActivityUiAutomatorTest.java
@@ -43,6 +43,7 @@
import com.android.adservices.service.consent.ConsentManager;
import com.android.adservices.ui.util.ApkTestUtil;
import com.android.dx.mockito.inline.extended.ExtendedMockito;
+import com.android.modules.utils.build.SdkLevel;
import org.junit.After;
import org.junit.Assert;
@@ -198,6 +199,8 @@
@Test
public void privacyPolicyLinkTest() throws UiObjectNotFoundException {
+ // TODO(277094594) fix broken Link Test on S
+ Assume.assumeTrue(SdkLevel.isAtLeastT());
ExtendedMockito.doReturn(true).when(mMockFlags).getGaUxFeatureEnabled();
String packageNameOfDefaultBrowser =
diff --git a/adservices/apk/tests/src/com/android/adservices/ui/settings/SettingsGaUiAutomatorTest.java b/adservices/apk/tests/src/com/android/adservices/ui/settings/SettingsGaUiAutomatorTest.java
index a5acf95..6287d5e 100644
--- a/adservices/apk/tests/src/com/android/adservices/ui/settings/SettingsGaUiAutomatorTest.java
+++ b/adservices/apk/tests/src/com/android/adservices/ui/settings/SettingsGaUiAutomatorTest.java
@@ -45,6 +45,7 @@
import com.android.adservices.ui.util.ApkTestUtil;
import com.android.compatibility.common.util.ShellUtils;
import com.android.dx.mockito.inline.extended.ExtendedMockito;
+import com.android.modules.utils.build.SdkLevel;
import org.junit.After;
import org.junit.Assert;
@@ -470,6 +471,8 @@
@Test
public void privacyPolicyLinkTest() throws UiObjectNotFoundException {
+ // TODO(277094594) fix broken Link Test on S
+ Assume.assumeTrue(SdkLevel.isAtLeastT());
ShellUtils.runShellCommand("device_config put adservices ga_ux_enabled true");
// First get the package name of device's default browser
