From 82a67a1a2d35ca9ea8a5b4258fa1f776477c1bef Mon Sep 17 00:00:00 2001 From: Vadim Tryshev Date: Tue, 19 Dec 2023 12:51:14 -0800 Subject: [PATCH] Re-promoting some tests to postsubmit Will watch their stability; may further promote to presubmit Bug: 187761685 Test: presubmit, abtd Flag: N/A Change-Id: Idf3949b1f04b0ff761ef1216fa41e9e8d11e8cdd --- .../com/android/quickstep/FallbackRecentsTest.java | 8 +++++--- .../com/android/quickstep/TaplTestsQuickstep.java | 14 +++++++++----- .../android/launcher3/dragging/TaplDragTest.java | 13 +++++++------ .../android/launcher3/ui/TaplWorkProfileTest.java | 8 ++++++-- 4 files changed, 27 insertions(+), 16 deletions(-) diff --git a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java index e0ee28dc02..c298f056af 100644 --- a/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java +++ b/quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java @@ -32,6 +32,8 @@ import static com.android.launcher3.ui.TaplTestsLauncher3.getAppPackageName; import static com.android.launcher3.util.Executors.MAIN_EXECUTOR; import static com.android.launcher3.util.rule.ShellCommandRule.disableHeadsUpNotification; import static com.android.launcher3.util.rule.ShellCommandRule.getLauncherCommand; +import static com.android.launcher3.util.rule.TestStabilityRule.LOCAL; +import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -67,7 +69,6 @@ import com.android.quickstep.views.RecentsView; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.RuleChain; @@ -185,9 +186,10 @@ public class FallbackRecentsTest { mLauncher.getLaunchedAppState().switchToOverview(); } - // b/143488140 + // Staging; will be promoted to presubmit if stable + @TestStabilityRule.Stability(flavors = LOCAL | PLATFORM_POSTSUBMIT) + //@NavigationModeSwitch - @Ignore @Test public void goToOverviewFromApp() { startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR)); diff --git a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java index 25adb62d2f..842ec865bd 100644 --- a/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java +++ b/quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java @@ -55,7 +55,6 @@ import com.android.quickstep.views.RecentsView; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; @@ -210,11 +209,12 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { return launcher.getOverviewPanel().getBottomRowTaskCountForTablet(); } - @Ignore + // Staging; will be promoted to presubmit if stable + @TestStabilityRule.Stability(flavors = LOCAL | PLATFORM_POSTSUBMIT) + @Test @NavigationModeSwitch @PortraitLandscape - @ScreenRecord // b/238461765 public void testSwitchToOverview() throws Exception { startTestAppsWithCheck(); assertNotNull("Workspace.switchToOverview() returned null", @@ -236,7 +236,9 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { } } - @Ignore + // Staging; will be promoted to presubmit if stable + @TestStabilityRule.Stability(flavors = LOCAL | PLATFORM_POSTSUBMIT) + @Test @NavigationModeSwitch @PortraitLandscape @@ -293,9 +295,11 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest { launchedAppState.switchToOverview(); } + // Staging; will be promoted to presubmit if stable + @TestStabilityRule.Stability(flavors = LOCAL | PLATFORM_POSTSUBMIT) + @Test @TaskbarModeSwitch - @Ignore // b/314873201 public void testQuickSwitchToPreviousAppForTablet() throws Exception { assumeTrue(mLauncher.isTablet()); startTestActivity(2); diff --git a/tests/src/com/android/launcher3/dragging/TaplDragTest.java b/tests/src/com/android/launcher3/dragging/TaplDragTest.java index e0403678ba..98905ea80a 100644 --- a/tests/src/com/android/launcher3/dragging/TaplDragTest.java +++ b/tests/src/com/android/launcher3/dragging/TaplDragTest.java @@ -15,11 +15,12 @@ */ package com.android.launcher3.dragging; -import static com.android.launcher3.util.TestConstants.AppNames.TEST_APP_NAME; import static com.android.launcher3.util.TestConstants.AppNames.GMAIL_APP_NAME; import static com.android.launcher3.util.TestConstants.AppNames.MAPS_APP_NAME; import static com.android.launcher3.util.TestConstants.AppNames.STORE_APP_NAME; -import static com.android.launcher3.ui.AbstractLauncherUiTest.initialize; +import static com.android.launcher3.util.TestConstants.AppNames.TEST_APP_NAME; +import static com.android.launcher3.util.rule.TestStabilityRule.LOCAL; +import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -39,10 +40,9 @@ import com.android.launcher3.tapl.Workspace; import com.android.launcher3.ui.AbstractLauncherUiTest; import com.android.launcher3.ui.PortraitLandscapeRunner.PortraitLandscape; import com.android.launcher3.util.TestUtil; -import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord; +import com.android.launcher3.util.rule.TestStabilityRule; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; /** @@ -68,10 +68,11 @@ public class TaplDragTest extends AbstractLauncherUiTest { * are no longer in the Workspace then adds a third one to test adding an icon to an existing * folder instead of creating one and drags it to the folder. */ + // Staging; will be promoted to presubmit if stable + @TestStabilityRule.Stability(flavors = LOCAL | PLATFORM_POSTSUBMIT) + @Test @PortraitLandscape - @ScreenRecord - @Ignore // b/233075289 @PlatinumTest(focusArea = "launcher") public void testDragToFolder() { // TODO: add the use case to drag an icon to an existing folder. Currently it either fails diff --git a/tests/src/com/android/launcher3/ui/TaplWorkProfileTest.java b/tests/src/com/android/launcher3/ui/TaplWorkProfileTest.java index f8185641bd..6d57a71ff6 100644 --- a/tests/src/com/android/launcher3/ui/TaplWorkProfileTest.java +++ b/tests/src/com/android/launcher3/ui/TaplWorkProfileTest.java @@ -20,6 +20,8 @@ import static com.android.launcher3.LauncherState.ALL_APPS; import static com.android.launcher3.LauncherState.NORMAL; import static com.android.launcher3.allapps.AllAppsStore.DEFER_UPDATES_TEST; import static com.android.launcher3.util.TestUtil.installDummyAppForUser; +import static com.android.launcher3.util.rule.TestStabilityRule.LOCAL; +import static com.android.launcher3.util.rule.TestStabilityRule.PLATFORM_POSTSUBMIT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -39,10 +41,10 @@ import com.android.launcher3.allapps.WorkPausedCard; import com.android.launcher3.allapps.WorkProfileManager; import com.android.launcher3.tapl.LauncherInstrumentation; import com.android.launcher3.util.TestUtil; +import com.android.launcher3.util.rule.TestStabilityRule; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import java.util.Objects; @@ -123,8 +125,10 @@ public class TaplWorkProfileTest extends AbstractLauncherUiTest { LauncherInstrumentation.WAIT_TIME_MS); } + // Staging; will be promoted to presubmit if stable + @TestStabilityRule.Stability(flavors = LOCAL | PLATFORM_POSTSUBMIT) + @Test - @Ignore("b/243855320") public void toggleWorks() { assumeTrue(mWorkProfileSetupSuccessful); waitForWorkTabSetup();