Merge "Revert "Re-promoting some tests to postsubmit"" into main (1a0c6844) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/tests/src/com/android/quickstep/FallbackRecentsTest.java

+3 −5

Original line number	Diff line number	Diff line
		@@ -32,8 +32,6 @@ import static com.android.launcher3.ui.TaplTestsLauncher3Test.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;
		@@ -69,6 +67,7 @@ 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;
		@@ -186,10 +185,9 @@ public class FallbackRecentsTest {
		mLauncher.getLaunchedAppState().switchToOverview();
		}

		// Staging; will be promoted to presubmit if stable
		@TestStabilityRule.Stability(flavors = LOCAL \| PLATFORM_POSTSUBMIT)

		// b/143488140
		//@NavigationModeSwitch
		@Ignore
		@Test
		public void goToOverviewFromApp() {
		startAppFast(resolveSystemApp(Intent.CATEGORY_APP_CALCULATOR));

quickstep/tests/src/com/android/quickstep/TaplTestsQuickstep.java

+5 −9

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@ 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;

		@@ -209,12 +210,11 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
		return launcher.<RecentsView>getOverviewPanel().getBottomRowTaskCountForTablet();
		}

		// Staging; will be promoted to presubmit if stable
		@TestStabilityRule.Stability(flavors = LOCAL \| PLATFORM_POSTSUBMIT)

		@Ignore
		@Test
		@NavigationModeSwitch
		@PortraitLandscape
		@ScreenRecord // b/238461765
		public void testSwitchToOverview() throws Exception {
		startTestAppsWithCheck();
		assertNotNull("Workspace.switchToOverview() returned null",
		@@ -236,9 +236,7 @@ public class TaplTestsQuickstep extends AbstractQuickStepTest {
		}
		}

		// Staging; will be promoted to presubmit if stable
		@TestStabilityRule.Stability(flavors = LOCAL \| PLATFORM_POSTSUBMIT)

		@Ignore
		@Test
		@NavigationModeSwitch
		@PortraitLandscape
		@@ -295,11 +293,9 @@ 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);

tests/src/com/android/launcher3/dragging/TaplDragTest.java

+6 −7

Original line number	Diff line number	Diff line
		@@ -15,12 +15,11 @@
		*/
		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.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 com.android.launcher3.ui.AbstractLauncherUiTest.initialize;

		import static org.junit.Assert.assertEquals;
		import static org.junit.Assert.assertNotNull;
		@@ -40,9 +39,10 @@ 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.TestStabilityRule;
		import com.android.launcher3.util.rule.ScreenRecordRule.ScreenRecord;

		import org.junit.Before;
		import org.junit.Ignore;
		import org.junit.Test;

		/**
		@@ -68,11 +68,10 @@ 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

tests/src/com/android/launcher3/ui/TaplWorkProfileTest.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -20,8 +20,6 @@ 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;
		@@ -41,10 +39,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;
		@@ -125,10 +123,8 @@ 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();