[Android] Convert .filters to @DisableIf(DESKTOP_FREEFORM) (part 8/8) These tests are disabled in all Desktop Freeform bots. This is a step to clean up the filters, allowing these to run in Test Reviver bots and making the code the sole source of truth in whether the test is disabled or not. Bug: 479879586 Change-Id: I7762a7bbba9d701cb6cfb84f1df2ffa77a1b8a8e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7818197 Commit-Queue: Henrique Nakashima <hnakashima@chromium.org> Owners-Override: Henrique Nakashima <hnakashima@chromium.org> Reviewed-by: Andrew Grieve <agrieve@chromium.org> Cr-Commit-Position: refs/heads/main@{#1626458}
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/app/tabmodel/ArchivedTabModelOrchestratorTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/app/tabmodel/ArchivedTabModelOrchestratorTest.java index 38e2d7de..0b72908 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/app/tabmodel/ArchivedTabModelOrchestratorTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/app/tabmodel/ArchivedTabModelOrchestratorTest.java
@@ -4,6 +4,9 @@ package org.chromium.chrome.browser.app.tabmodel; +import org.chromium.base.test.util.DisableIf; +import org.chromium.ui.base.DeviceFormFactor; + import static androidx.test.espresso.Espresso.onView; import static androidx.test.espresso.assertion.ViewAssertions.doesNotExist; import static androidx.test.espresso.matcher.ViewMatchers.withId; @@ -481,6 +484,7 @@ @Test @MediumTest + @DisableIf.Device(DeviceFormFactor.DESKTOP_FREEFORM) // crbug.com/444482498 public void testOpenArchivedTabFromHubSearch_Incognito() { finishLoading(); String declutterUrl = mActivityTestRule.getTestServer().getURL(TEST_PATH);
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridgeTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridgeTest.java index 324bd20..9fbf2487 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridgeTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/browsing_data/BrowsingDataBridgeTest.java
@@ -4,6 +4,9 @@ package org.chromium.chrome.browser.browsing_data; +import org.chromium.base.test.util.DisableIf; +import org.chromium.ui.base.DeviceFormFactor; + import static androidx.test.espresso.matcher.ViewMatchers.assertThat; import static org.junit.Assert.assertEquals; @@ -230,6 +233,7 @@ /** Test deleting all browsing data. (Except bookmarks, they are deleted in Java code) */ @Test @SmallTest + @DisableIf.Device(DeviceFormFactor.DESKTOP_FREEFORM) // crbug.com/444482498 public void testClearingAll() throws Exception { ThreadUtils.runOnUiThreadBlocking( () -> {
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestContactDetailsTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestContactDetailsTest.java index 085e422..0ad7809 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestContactDetailsTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestContactDetailsTest.java
@@ -4,6 +4,9 @@ package org.chromium.chrome.browser.payments; +import org.chromium.base.test.util.DisableIf; +import org.chromium.ui.base.DeviceFormFactor; + import androidx.test.filters.MediumTest; import org.junit.Assert; @@ -35,6 +38,7 @@ /** A payment integration test for a merchant that requests contact details. */ @RunWith(ChromeJUnit4ClassRunner.class) @CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE}) +@DisableIf.Device(DeviceFormFactor.DESKTOP_FREEFORM) // crbug.com/444482498 public class PaymentRequestContactDetailsTest { @Rule public PaymentRequestTestRule mPaymentRequestTestRule =
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/suggestions/tile/MostVisitedTilesLayoutTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/suggestions/tile/MostVisitedTilesLayoutTest.java index f99f483..e6dfa573 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/suggestions/tile/MostVisitedTilesLayoutTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/suggestions/tile/MostVisitedTilesLayoutTest.java
@@ -4,6 +4,9 @@ package org.chromium.chrome.browser.suggestions.tile; +import org.chromium.base.test.util.DisableIf; +import org.chromium.ui.base.DeviceFormFactor; + import static android.content.res.Configuration.ORIENTATION_LANDSCAPE; import static android.content.res.Configuration.ORIENTATION_PORTRAIT; @@ -149,6 +152,7 @@ @Feature({"NewTabPage", "RenderTest"}) @ParameterAnnotations.UseMethodParameter(NightModeTestUtils.NightModeParams.class) @DisableFeatures({ChromeFeatureList.MOST_VISITED_TILES_CUSTOMIZATION}) + @DisableIf.Device(DeviceFormFactor.DESKTOP_FREEFORM) // crbug.com/444482498 public void testTilesLayoutAppearance_DisableMvtCustomization(boolean nightModeEnabled) throws Exception { doTilesLayoutAppearanceTest(nightModeEnabled, ""); @@ -159,6 +163,7 @@ @Feature({"NewTabPage", "RenderTest"}) @ParameterAnnotations.UseMethodParameter(NightModeTestUtils.NightModeParams.class) @EnableFeatures({ChromeFeatureList.MOST_VISITED_TILES_CUSTOMIZATION}) + @DisableIf.Device(DeviceFormFactor.DESKTOP_FREEFORM) // crbug.com/444482498 public void testTilesLayoutAppearance_EnableMvtCustomization(boolean nightModeEnabled) throws Exception { doTilesLayoutAppearanceTest(nightModeEnabled, "_with_add_new_button"); @@ -177,6 +182,7 @@ @MediumTest @Feature({"NewTabPage", "RenderTest"}) @DisableFeatures({ChromeFeatureList.MOST_VISITED_TILES_CUSTOMIZATION}) + @DisableIf.Device(DeviceFormFactor.DESKTOP_FREEFORM) // crbug.com/444482498 public void testModernTilesLayoutAppearance_Full_DisableMvtCustomization() throws IOException, InterruptedException { doModernTilesLayoutAppearanceTest_Full(""); @@ -186,6 +192,7 @@ @MediumTest @Feature({"NewTabPage", "RenderTest"}) @EnableFeatures({ChromeFeatureList.MOST_VISITED_TILES_CUSTOMIZATION}) + @DisableIf.Device(DeviceFormFactor.DESKTOP_FREEFORM) // crbug.com/444482498 public void testModernTilesLayoutAppearance_Full_EnableMvtCustomization() throws IOException, InterruptedException { doModernTilesLayoutAppearanceTest_Full("_with_add_new_button"); @@ -222,6 +229,7 @@ @Test @MediumTest @Feature({"NewTabPage", "RenderTest"}) + @DisableIf.Device(DeviceFormFactor.DESKTOP_FREEFORM) // crbug.com/444482498 public void testModernTilesLayoutAppearance_Two() throws IOException, InterruptedException { ThreadUtils.runOnUiThreadBlocking( () ->
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/webid/DigitalCredentialProviderTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/webid/DigitalCredentialProviderTest.java index 88db5ba..e7e9d299 100644 --- a/chrome/android/javatests/src/org/chromium/chrome/browser/webid/DigitalCredentialProviderTest.java +++ b/chrome/android/javatests/src/org/chromium/chrome/browser/webid/DigitalCredentialProviderTest.java
@@ -4,6 +4,9 @@ package org.chromium.chrome.browser.webid; +import org.chromium.base.test.util.DisableIf; +import org.chromium.ui.base.DeviceFormFactor; + import static org.hamcrest.Matchers.is; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; @@ -45,6 +48,7 @@ @RunWith(ChromeJUnit4ClassRunner.class) @CommandLineFlags.Add({ChromeSwitches.DISABLE_FIRST_RUN_EXPERIENCE}) @Batch(Batch.PER_CLASS) +@DisableIf.Device(DeviceFormFactor.DESKTOP_FREEFORM) // crbug.com/444482498 public class DigitalCredentialProviderTest { private static final String TEST_PAGE = "/chrome/test/data/android/dc_mdocs.html"; private static final String EXPECTED_MDOC = "test-mdoc";
diff --git a/chrome/browser/image_descriptions/BUILD.gn b/chrome/browser/image_descriptions/BUILD.gn index 9ce828ce..d0be306f 100644 --- a/chrome/browser/image_descriptions/BUILD.gn +++ b/chrome/browser/image_descriptions/BUILD.gn
@@ -122,6 +122,7 @@ "//components/user_prefs/android:java", "//content/public/android:content_java", "//content/public/test/android:content_java_test_support", + "//ui/android:ui_java", "//third_party/android_deps:espresso_java", "//third_party/androidx:androidx_fragment_fragment_java", "//third_party/androidx:androidx_preference_preference_java",
diff --git a/chrome/browser/image_descriptions/android/java/src/org/chromium/chrome/browser/image_descriptions/ImageDescriptionsSettingsTest.java b/chrome/browser/image_descriptions/android/java/src/org/chromium/chrome/browser/image_descriptions/ImageDescriptionsSettingsTest.java index f3c8852..4559788 100644 --- a/chrome/browser/image_descriptions/android/java/src/org/chromium/chrome/browser/image_descriptions/ImageDescriptionsSettingsTest.java +++ b/chrome/browser/image_descriptions/android/java/src/org/chromium/chrome/browser/image_descriptions/ImageDescriptionsSettingsTest.java
@@ -4,6 +4,9 @@ package org.chromium.chrome.browser.image_descriptions; +import org.chromium.base.test.util.DisableIf; +import org.chromium.ui.base.DeviceFormFactor; + import static androidx.test.espresso.Espresso.onView; import static androidx.test.espresso.action.ViewActions.click; import static androidx.test.espresso.matcher.ViewMatchers.withId; @@ -265,6 +268,7 @@ @Test @SmallTest + @DisableIf.Device(DeviceFormFactor.DESKTOP_FREEFORM) // crbug.com/444482498 public void testUserTogglesSwitch_Off() { // When we toggle switch to Off, it should disable radio buttons and descriptions ThreadUtils.runOnUiThreadBlocking(
diff --git a/chrome/browser/privacy_sandbox/android/javatests/src/org/chromium/chrome/browser/privacy_sandbox/AdMeasurementFragmentTest.java b/chrome/browser/privacy_sandbox/android/javatests/src/org/chromium/chrome/browser/privacy_sandbox/AdMeasurementFragmentTest.java index e424d6e..7420e0f 100644 --- a/chrome/browser/privacy_sandbox/android/javatests/src/org/chromium/chrome/browser/privacy_sandbox/AdMeasurementFragmentTest.java +++ b/chrome/browser/privacy_sandbox/android/javatests/src/org/chromium/chrome/browser/privacy_sandbox/AdMeasurementFragmentTest.java
@@ -4,6 +4,9 @@ package org.chromium.chrome.browser.privacy_sandbox; +import org.chromium.base.test.util.DisableIf; +import org.chromium.ui.base.DeviceFormFactor; + import static androidx.test.espresso.Espresso.onView; import static androidx.test.espresso.action.ViewActions.click; import static androidx.test.espresso.assertion.ViewAssertions.matches; @@ -170,6 +173,7 @@ @Test @SmallTest + @DisableIf.Device(DeviceFormFactor.DESKTOP_FREEFORM) // crbug.com/444482498 public void testTurnAdMeasurementOn() { setAdMeasurementPrefEnabled(false); startAdMeasuremenSettings(); @@ -183,6 +187,7 @@ @Test @SmallTest + @DisableIf.Device(DeviceFormFactor.DESKTOP_FREEFORM) // crbug.com/444482498 public void testTurnAdMeasurementOff() { setAdMeasurementPrefEnabled(true); startAdMeasuremenSettings();
diff --git a/chrome/browser/privacy_sandbox/android/javatests/src/org/chromium/chrome/browser/privacy_sandbox/FledgeFragmentTest.java b/chrome/browser/privacy_sandbox/android/javatests/src/org/chromium/chrome/browser/privacy_sandbox/FledgeFragmentTest.java index 8caf397..f736af33 100644 --- a/chrome/browser/privacy_sandbox/android/javatests/src/org/chromium/chrome/browser/privacy_sandbox/FledgeFragmentTest.java +++ b/chrome/browser/privacy_sandbox/android/javatests/src/org/chromium/chrome/browser/privacy_sandbox/FledgeFragmentTest.java
@@ -4,6 +4,9 @@ package org.chromium.chrome.browser.privacy_sandbox; +import org.chromium.base.test.util.DisableIf; +import org.chromium.ui.base.DeviceFormFactor; + import static androidx.test.espresso.Espresso.onView; import static androidx.test.espresso.Espresso.pressBack; import static androidx.test.espresso.action.ViewActions.click; @@ -433,6 +436,7 @@ @Test @SmallTest + @DisableIf.Device(DeviceFormFactor.DESKTOP_FREEFORM) // crbug.com/444482498 public void unblockSitesV2() { setFledgePrefEnabled(true); mFakePrivacySandboxBridge.setBlockedFledgeSites(SITE_NAME_1, SITE_NAME_2);
diff --git a/chrome/browser/privacy_sandbox/android/javatests/src/org/chromium/chrome/browser/privacy_sandbox/TopicsFragmentTest.java b/chrome/browser/privacy_sandbox/android/javatests/src/org/chromium/chrome/browser/privacy_sandbox/TopicsFragmentTest.java index f2613ac..d885590f 100644 --- a/chrome/browser/privacy_sandbox/android/javatests/src/org/chromium/chrome/browser/privacy_sandbox/TopicsFragmentTest.java +++ b/chrome/browser/privacy_sandbox/android/javatests/src/org/chromium/chrome/browser/privacy_sandbox/TopicsFragmentTest.java
@@ -4,6 +4,9 @@ package org.chromium.chrome.browser.privacy_sandbox; +import org.chromium.base.test.util.DisableIf; +import org.chromium.ui.base.DeviceFormFactor; + import static androidx.test.espresso.Espresso.onView; import static androidx.test.espresso.Espresso.pressBack; import static androidx.test.espresso.action.ViewActions.click; @@ -218,6 +221,7 @@ @Test @SmallTest + @DisableIf.Device(DeviceFormFactor.DESKTOP_FREEFORM) // crbug.com/444482498 public void testTurnTopicsOnWhenTopicListEmpty() { setTopicsPrefEnabled(false); startTopicsSettings(); @@ -239,6 +243,7 @@ @Test @SmallTest + @DisableIf.Device(DeviceFormFactor.DESKTOP_FREEFORM) // crbug.com/444482498 public void testTurnTopicsOnWhenTopicsListPopulated() { setTopicsPrefEnabled(false); mFakePrivacySandboxBridge.setCurrentTopTopics(TOPIC_NAME_1, TOPIC_NAME_2); @@ -263,6 +268,7 @@ @Test @SmallTest + @DisableIf.Device(DeviceFormFactor.DESKTOP_FREEFORM) // crbug.com/444482498 public void testTurnTopicsOff() { setTopicsPrefEnabled(true); startTopicsSettings(); @@ -291,6 +297,7 @@ @Test @SmallTest + @DisableIf.Device(DeviceFormFactor.DESKTOP_FREEFORM) // crbug.com/444482498 public void testBlockedTopicsAppearWhenTopicOn() { setTopicsPrefEnabled(true); mFakePrivacySandboxBridge.setBlockedTopics(TOPIC_NAME_1, TOPIC_NAME_2); @@ -349,6 +356,7 @@ @Test @SmallTest + @DisableIf.Device(DeviceFormFactor.DESKTOP_FREEFORM) // crbug.com/444482498 public void testUnblockTopicsAdTopicsContentParity() { setTopicsPrefEnabled(true); mFakePrivacySandboxBridge.setBlockedTopics(TOPIC_NAME_1, TOPIC_NAME_2);
diff --git a/chrome/browser/ui/android/extensions/windowing/internal/java/src/org/chromium/chrome/browser/ui/extensions/windowing/ExtensionWindowControllerBridgeIntegrationTest.java b/chrome/browser/ui/android/extensions/windowing/internal/java/src/org/chromium/chrome/browser/ui/extensions/windowing/ExtensionWindowControllerBridgeIntegrationTest.java index 9c7c9a7..e5cb3a3 100644 --- a/chrome/browser/ui/android/extensions/windowing/internal/java/src/org/chromium/chrome/browser/ui/extensions/windowing/ExtensionWindowControllerBridgeIntegrationTest.java +++ b/chrome/browser/ui/android/extensions/windowing/internal/java/src/org/chromium/chrome/browser/ui/extensions/windowing/ExtensionWindowControllerBridgeIntegrationTest.java
@@ -3,6 +3,8 @@ // found in the LICENSE file. package org.chromium.chrome.browser.ui.extensions.windowing; +import org.chromium.base.test.util.DisableIf; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; @@ -149,6 +151,7 @@ @Test @MediumTest @Restriction(DeviceFormFactor.TABLET_OR_DESKTOP /* Test needs "new window" in app menu. */) + @DisableIf.Device(DeviceFormFactor.DESKTOP_FREEFORM) // crbug.com/444482498 public void startChromeTabbedActivity_openNewWindow_notifyExtensionInternalsOfWindowCreation() { // Arrange: // (1) Launch ChromeTabbedActivity (the first window). @@ -186,6 +189,7 @@ @Test @MediumTest @Restriction(DeviceFormFactor.TABLET_OR_DESKTOP /* Test needs "new window" in app menu. */) + @DisableIf.Device(DeviceFormFactor.DESKTOP_FREEFORM) // crbug.com/444482498 public void openIncognitoWindow_destroyIncognitoTabModel_notifyExtensionInternalsOfWindowDestruction() { // Arrange: @@ -363,6 +367,7 @@ @Test @MediumTest @Restriction(DeviceFormFactor.TABLET_OR_DESKTOP /* Test needs "new window" in app menu. */) + @DisableIf.Device(DeviceFormFactor.DESKTOP_FREEFORM) // crbug.com/444482498 public void startChromeTabbedActivity_triggerTaskFocusChange_notifyExtensionWindowController() { // Arrange: // (1) Launch ChromeTabbedActivity (the first window).