Moved no longer flaky WM CTS tests to pre-submit
Bug: 123654474
Bug: 121122996
Bug: 109874623
Bug: 77652261
Fixes: 122118854
Bug: 80380150
Bug: 112055644
Bug: 77207453
Bug: 118708868
Bug: 120748674
Fixes: 73701185
Fixes: 73812451
Bug: 71875631
Test: self
Change-Id: Ided2160a2705913ab6ad89b9ff099889098fb0a1
diff --git a/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerAssistantStackTests.java b/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerAssistantStackTests.java
index c3e21d3..e3be730 100644
--- a/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerAssistantStackTests.java
+++ b/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerAssistantStackTests.java
@@ -65,7 +65,6 @@
* atest CtsActivityManagerDeviceTestCases:ActivityManagerAssistantStackTests
*/
@Presubmit
-@FlakyTest(bugId = 71875631)
public class ActivityManagerAssistantStackTests extends ActivityManagerTestBase {
private int mAssistantDisplayId = DEFAULT_DISPLAY;
diff --git a/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerConfigChangeTests.java b/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerConfigChangeTests.java
index b7a399b..28317b5 100644
--- a/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerConfigChangeTests.java
+++ b/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerConfigChangeTests.java
@@ -45,7 +45,6 @@
import android.server.am.CommandSession.SizeInfo;
import android.server.am.TestJournalProvider.TestJournalContainer;
import android.server.am.settings.SettingsSession;
-import android.support.test.filters.FlakyTest;
import com.android.compatibility.common.util.SystemUtil;
@@ -102,14 +101,12 @@
testRotation(NO_RELAUNCH_ACTIVITY, 2, 0, 0);
}
- @FlakyTest(bugId = 73701185)
@Test
public void testChangeFontScaleRelaunch() throws Exception {
// Should relaunch and receive no onConfigurationChanged()
testChangeFontScale(FONT_SCALE_ACTIVITY, true /* relaunch */);
}
- @FlakyTest(bugId = 73812451)
@Test
public void testChangeFontScaleNoRelaunch() throws Exception {
// Should receive onConfigurationChanged() and no relaunch
diff --git a/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerDisplayTests.java b/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerDisplayTests.java
index a82bdc3..e28779f 100644
--- a/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerDisplayTests.java
+++ b/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerDisplayTests.java
@@ -25,7 +25,6 @@
import android.platform.test.annotations.Presubmit;
import android.server.am.ActivityManagerState.ActivityDisplay;
-import android.support.test.filters.FlakyTest;
import android.util.Size;
import org.junit.Test;
@@ -43,7 +42,6 @@
* Tests that the global configuration is equal to the default display's override configuration.
*/
@Test
- @FlakyTest
public void testDefaultDisplayOverrideConfiguration() throws Exception {
final List<ActivityDisplay> reportedDisplays = getDisplaysStates();
final ActivityDisplay primaryDisplay = getDisplayState(reportedDisplays, DEFAULT_DISPLAY);
diff --git a/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerMultiDisplayTests.java b/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerMultiDisplayTests.java
index b2ab3f5..67ed269 100644
--- a/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerMultiDisplayTests.java
+++ b/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerMultiDisplayTests.java
@@ -111,7 +111,6 @@
import android.server.am.CommandSession.SizeInfo;
import android.server.am.TestJournalProvider.TestJournalContainer;
import android.server.am.WindowManagerState.WindowState;
-import android.support.test.filters.FlakyTest;
import android.text.TextUtils;
import android.util.SparseArray;
import android.view.Display;
@@ -365,7 +364,6 @@
* virtual display.
*/
@Test
- @FlakyTest(bugId = 112055644)
public void testLaunchNonResizeableActivityOnSecondaryDisplay() throws Exception {
try (final VirtualDisplaySession virtualDisplaySession = new VirtualDisplaySession()) {
// Create new virtual display.
@@ -421,7 +419,6 @@
* land on the secondary display based on the resizeability of the root activity of the task.
*/
@Test
- @FlakyTest(bugId = 112055644)
public void testLaunchNonResizeableActivityFromSecondaryDisplaySameTask() throws Exception {
try (final VirtualDisplaySession virtualDisplaySession = new VirtualDisplaySession()) {
// Create new simulated display.
@@ -445,7 +442,6 @@
* there. It must land on the display as its caller.
*/
@Test
- @FlakyTest(bugId = 112055644)
public void testLaunchNonResizeableActivityFromSecondaryDisplayNewTask() throws Exception {
try (final VirtualDisplaySession virtualDisplaySession = new VirtualDisplaySession()) {
// Create new virtual display.
@@ -516,7 +512,6 @@
* for activities with same UID.
*/
@Test
- @FlakyTest(bugId = 112055644)
public void testLaunchWithoutPermissionOnVirtualDisplayByOwner() throws Exception {
try (final VirtualDisplaySession virtualDisplaySession = new VirtualDisplaySession()) {
// Create new virtual display.
@@ -581,7 +576,6 @@
* first one - it must appear on the secondary display, because it was launched from there.
*/
@Test
- @FlakyTest(bugId = 112055644)
public void testConsequentLaunchActivityFromSecondaryDisplay() throws Exception {
try (final VirtualDisplaySession virtualDisplaySession = new VirtualDisplaySession()) {
// Create new simulated display.
@@ -634,7 +628,6 @@
* first one with specifying the target display - it must appear on the secondary display.
*/
@Test
- @FlakyTest(bugId = 112055644)
public void testConsequentLaunchActivityFromVirtualDisplayToTargetDisplay() throws Exception {
try (final VirtualDisplaySession virtualDisplaySession = new VirtualDisplaySession()) {
// Create new virtual display.
@@ -675,7 +668,6 @@
* doesn't allow embedding - it should fail with security exception.
*/
@Test
- @FlakyTest(bugId = 112055644)
public void testConsequentLaunchActivityFromVirtualDisplayNoEmbedding() throws Exception {
try (final VirtualDisplaySession virtualDisplaySession = new VirtualDisplaySession()) {
// Create new virtual display.
@@ -703,7 +695,6 @@
* Tests launching an activity to secondary display from activity on primary display.
*/
@Test
- @FlakyTest(bugId = 112055644)
public void testLaunchActivityFromAppToSecondaryDisplay() throws Exception {
// Start launching activity.
launchActivity(LAUNCHING_ACTIVITY);
@@ -1046,7 +1037,6 @@
* This version launches virtual display creator to fullscreen stack in split-screen.
*/
@Test
- @FlakyTest(bugId = 77207453)
public void testStackFocusSwitchOnDisplayRemoved() throws Exception {
assumeTrue(supportsSplitScreenMultiWindow());
@@ -1066,7 +1056,6 @@
* This version launches virtual display creator to docked stack in split-screen.
*/
@Test
- @FlakyTest(bugId = 77207453)
public void testStackFocusSwitchOnDisplayRemoved2() throws Exception {
assumeTrue(supportsSplitScreenMultiWindow());
@@ -1150,7 +1139,6 @@
* is moved correctly.
*/
@Test
- @FlakyTest(bugId = 112055644)
public void testStackFocusSwitchOnStackEmptiedInSleeping() throws Exception {
try (final VirtualDisplaySession virtualDisplaySession = new VirtualDisplaySession();
final LockScreenSession lockScreenSession = new LockScreenSession()) {
@@ -1163,7 +1151,6 @@
* is moved correctly.
*/
@Test
- @FlakyTest(bugId = 112055644)
public void testStackFocusSwitchOnStackEmptied() throws Exception {
try (final VirtualDisplaySession virtualDisplaySession = new VirtualDisplaySession()) {
validateStackFocusSwitchOnStackEmptied(virtualDisplaySession,
@@ -1204,7 +1191,6 @@
* Tests that input events on the primary display take focus from the virtual display.
*/
@Test
- @FlakyTest(bugId = 112055644)
public void testStackFocusSwitchOnTouchEvent() throws Exception {
try (final VirtualDisplaySession virtualDisplaySession = new VirtualDisplaySession()) {
// Create new virtual display.
@@ -1283,7 +1269,6 @@
/** Test that launching app from pending activity queue on external display is allowed. */
@Test
- @FlakyTest(bugId = 118708868)
public void testLaunchPendingActivityOnSecondaryDisplay() throws Exception {
try (final VirtualDisplaySession virtualDisplaySession = new VirtualDisplaySession()) {
// Create new simulated display.
@@ -1324,7 +1309,6 @@
/** Test that launching from app that is on external display is allowed. */
@Test
- @FlakyTest(bugId = 112055644)
public void testPermissionLaunchFromAppOnSecondary() throws Exception {
try (final VirtualDisplaySession virtualDisplaySession = new VirtualDisplaySession()) {
// Create new simulated display.
@@ -1388,7 +1372,6 @@
* doesn't have anything on the display.
*/
@Test
- @FlakyTest(bugId = 112055644)
public void testPermissionLaunchFromOwner() throws Exception {
try (final VirtualDisplaySession virtualDisplaySession = new VirtualDisplaySession()) {
// Create new virtual display.
@@ -1481,7 +1464,6 @@
* Test that only private virtual display can show content with insecure keyguard.
*/
@Test
- @FlakyTest(bugId = 112055644)
public void testFlagShowWithInsecureKeyguardOnPublicVirtualDisplay() throws Exception {
try (final VirtualDisplaySession virtualDisplaySession = new VirtualDisplaySession()) {
// Try to create new show-with-insecure-keyguard public virtual display.
@@ -1625,7 +1607,6 @@
* matching task on some other display - that task will moved to the target display.
*/
@Test
- @FlakyTest(bugId = 112055644)
public void testMoveToDisplayOnLaunch() throws Exception {
// Launch activity with unique affinity, so it will the only one in its task.
launchActivity(LAUNCHING_ACTIVITY);
@@ -1766,7 +1747,6 @@
* matching the task component root does.
*/
@Test
- @FlakyTest(bugId = 112055644)
public void testTaskMatchAcrossDisplays() throws Exception {
try (final VirtualDisplaySession virtualDisplaySession = new VirtualDisplaySession()) {
final ActivityDisplay newDisplay = virtualDisplaySession.createDisplay();
@@ -1850,7 +1830,6 @@
* Tests that the task affinity search respects the launch display id.
*/
@Test
- @FlakyTest(bugId = 112055644)
public void testLaunchDisplayAffinityMatch() throws Exception {
try (final VirtualDisplaySession virtualDisplaySession = new VirtualDisplaySession()) {
final ActivityDisplay newDisplay = virtualDisplaySession.createDisplay();
@@ -1894,7 +1873,6 @@
* even if the focused stack is not on that activity's display.
*/
@Test
- @FlakyTest(bugId = 112055644)
public void testNewTaskSameDisplay() throws Exception {
try (final VirtualDisplaySession virtualDisplaySession = new VirtualDisplaySession()) {
final ActivityDisplay newDisplay = virtualDisplaySession.setSimulateDisplay(true)
@@ -2017,7 +1995,6 @@
* display is off.
*/
@Test
- @FlakyTest(bugId = 112055644)
public void testLaunchExternalDisplayActivityWhilePrimaryOff() throws Exception {
// Launch something on the primary display so we know there is a resumed activity there
launchActivity(RESIZEABLE_ACTIVITY);
@@ -2082,7 +2059,6 @@
* activity on the primary display.
*/
@Test
- @FlakyTest(bugId = 112055644)
public void testStackFocusSwitchOnTouchEventAfterKeyguard() throws Exception {
// Launch something on the primary display so we know there is a resumed activity there
launchActivity(RESIZEABLE_ACTIVITY);
@@ -2596,7 +2572,6 @@
* Test that navigation bar should show on display with system decoration.
*/
@Test
- @FlakyTest(bugId = 120748674)
public void testNavBarShowingOnDisplayWithDecor() throws Exception {
try (final VirtualDisplaySession virtualDisplaySession = new VirtualDisplaySession()) {
final ActivityDisplay newDisplay = virtualDisplaySession
@@ -2610,7 +2585,6 @@
* Test that navigation bar should not show on display without system decoration.
*/
@Test
- @FlakyTest(bugId = 120748674)
public void testNavBarNotShowingOnDisplayWithoutDecor() throws Exception {
try (final VirtualDisplaySession virtualDisplaySession = new VirtualDisplaySession()) {
virtualDisplaySession.setPublicDisplay(true)
@@ -2627,7 +2601,6 @@
* supports system decoration.
*/
@Test
- @FlakyTest(bugId = 120748674)
public void testNavBarNotShowingOnPrivateDisplay() throws Exception {
try (final VirtualDisplaySession virtualDisplaySession = new VirtualDisplaySession()) {
virtualDisplaySession.setPublicDisplay(false)
diff --git a/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerRobustnessTests.java b/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerRobustnessTests.java
index 8c568ba..8d8278e 100644
--- a/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerRobustnessTests.java
+++ b/tests/framework/base/activitymanager/src/android/server/am/ActivityManagerRobustnessTests.java
@@ -28,7 +28,6 @@
* atest CtsActivityManagerDeviceTestCases:ActivityManagerRobustnessTests
*/
@Presubmit
-@FlakyTest
public class ActivityManagerRobustnessTests extends ActivityManagerTestBase {
/**
diff --git a/tests/framework/base/activitymanager/src/android/server/am/ActivityMetricsLoggerTests.java b/tests/framework/base/activitymanager/src/android/server/am/ActivityMetricsLoggerTests.java
index 29449c8..a02023e 100644
--- a/tests/framework/base/activitymanager/src/android/server/am/ActivityMetricsLoggerTests.java
+++ b/tests/framework/base/activitymanager/src/android/server/am/ActivityMetricsLoggerTests.java
@@ -78,6 +78,7 @@
* Build/Install/Run:
* atest CtsActivityManagerDeviceTestCases:ActivityMetricsLoggerTests
*/
+@Presubmit
public class ActivityMetricsLoggerTests extends ActivityManagerTestBase {
private static final String TAG_ATM = "ActivityTaskManager";
private final MetricsReader mMetricsReader = new MetricsReader();
@@ -100,7 +101,6 @@
* In all three cases, verify the delay measurements are the same.
*/
@Test
- @Presubmit
public void testAppLaunchIsLogged() {
getLaunchActivityBuilder()
.setUseInstrumentation()
@@ -179,7 +179,6 @@
* See {@link Activity#reportFullyDrawn()}
*/
@Test
- @Presubmit
public void testAppFullyDrawnReportIsLogged() {
getLaunchActivityBuilder()
.setUseInstrumentation()
@@ -215,8 +214,6 @@
* metrics logs. Verify we output the correct launch state.
*/
@Test
- @Presubmit
- @FlakyTest(bugId = 122118854)
public void testAppWarmLaunchSetsWaitResultDelayData() {
SystemUtil.runShellCommand("am start -S -W " + TEST_ACTIVITY.flattenToShortString());
@@ -253,8 +250,6 @@
* metrics logs. Verify we output the correct launch state.
*/
@Test
- @Presubmit
- @FlakyTest(bugId = 122118854)
public void testAppHotLaunchSetsWaitResultDelayData() {
SystemUtil.runShellCommand("am start -S -W " + TEST_ACTIVITY.flattenToShortString());
@@ -291,7 +286,6 @@
* metrics logs. Verify we output the correct launch state.
*/
@Test
- @Presubmit
public void testAppColdLaunchSetsWaitResultDelayData() {
final String amStartOutput = SystemUtil.runShellCommand(
"am start -S -W " + TEST_ACTIVITY.flattenToShortString());
@@ -320,7 +314,6 @@
* see b/117148004
*/
@Test
- @Presubmit
public void testLaunchOfVisibleApp() {
// Launch an activity.
getLaunchActivityBuilder()
@@ -371,8 +364,6 @@
* trampoline activity. See b/80380150 (Long warm launch times reported in dev play console)
*/
@Test
- @Presubmit
- @FlakyTest(bugId = 80380150)
public void testNoDisplayActivityLaunch() {
getLaunchActivityBuilder()
.setUseInstrumentation()
@@ -398,7 +389,6 @@
* draws on screen.
*/
@Test
- @Presubmit
public void testTrampolineActivityLaunch() {
// Launch a trampoline activity that will launch single task activity.
getLaunchActivityBuilder()
diff --git a/tests/framework/base/activitymanager/src/android/server/am/ActivityViewTest.java b/tests/framework/base/activitymanager/src/android/server/am/ActivityViewTest.java
index 857644f..9e4e2f7 100644
--- a/tests/framework/base/activitymanager/src/android/server/am/ActivityViewTest.java
+++ b/tests/framework/base/activitymanager/src/android/server/am/ActivityViewTest.java
@@ -50,7 +50,6 @@
* atest CtsActivityManagerDeviceTestCases:ActivityViewTest
*/
@Presubmit
-@FlakyTest
public class ActivityViewTest extends ActivityManagerTestBase {
private Instrumentation mInstrumentation;
diff --git a/tests/framework/base/activitymanager/src/android/server/am/KeyguardLockedTests.java b/tests/framework/base/activitymanager/src/android/server/am/KeyguardLockedTests.java
index 067a083..75ade88 100644
--- a/tests/framework/base/activitymanager/src/android/server/am/KeyguardLockedTests.java
+++ b/tests/framework/base/activitymanager/src/android/server/am/KeyguardLockedTests.java
@@ -295,7 +295,6 @@
}
@Test
- @FlakyTest
public void testShowWhenLockedAttrImeActivityAndShowSoftInput() throws Exception {
try (final LockScreenSession lockScreenSession = new LockScreenSession();
// Leverage MockImeSession to ensure at least an IME exists as default.
@@ -317,7 +316,6 @@
}
@Test
- @FlakyTest
public void testShowWhenLockedImeActivityAndShowSoftInput() throws Exception {
try (final LockScreenSession lockScreenSession = new LockScreenSession();
final TestActivitySession<ShowWhenLockedImeActivity> imeTestActivitySession = new
diff --git a/tests/framework/base/activitymanager/src/android/server/am/StartActivityTests.java b/tests/framework/base/activitymanager/src/android/server/am/StartActivityTests.java
index b0e85e8..eb49d73 100644
--- a/tests/framework/base/activitymanager/src/android/server/am/StartActivityTests.java
+++ b/tests/framework/base/activitymanager/src/android/server/am/StartActivityTests.java
@@ -34,7 +34,6 @@
* atest CtsActivityManagerDeviceTestCases:StartActivityTests
*/
@Presubmit
-@FlakyTest
public class StartActivityTests extends ActivityManagerTestBase {
@Rule
diff --git a/tests/framework/base/activitymanager/src/android/server/am/lifecycle/ActivityLifecycleFreeformTests.java b/tests/framework/base/activitymanager/src/android/server/am/lifecycle/ActivityLifecycleFreeformTests.java
index bab51ac..b0eee2c 100644
--- a/tests/framework/base/activitymanager/src/android/server/am/lifecycle/ActivityLifecycleFreeformTests.java
+++ b/tests/framework/base/activitymanager/src/android/server/am/lifecycle/ActivityLifecycleFreeformTests.java
@@ -49,7 +49,6 @@
* Build/Install/Run:
* atest CtsActivityManagerDeviceTestCases:ActivityLifecycleFreeformTests
*/
-@FlakyTest(bugId = 77652261)
@MediumTest
@Presubmit
public class ActivityLifecycleFreeformTests extends ActivityLifecycleClientTestBase {
diff --git a/tests/framework/base/activitymanager/src/android/server/am/lifecycle/ActivityLifecycleSplitScreenTests.java b/tests/framework/base/activitymanager/src/android/server/am/lifecycle/ActivityLifecycleSplitScreenTests.java
index 4950aa6..489f951 100644
--- a/tests/framework/base/activitymanager/src/android/server/am/lifecycle/ActivityLifecycleSplitScreenTests.java
+++ b/tests/framework/base/activitymanager/src/android/server/am/lifecycle/ActivityLifecycleSplitScreenTests.java
@@ -58,7 +58,6 @@
* Build/Install/Run:
* atest CtsActivityManagerDeviceTestCases:ActivityLifecycleSplitScreenTests
*/
-@FlakyTest(bugId = 77652261)
@MediumTest
@Presubmit
public class ActivityLifecycleSplitScreenTests extends ActivityLifecycleClientTestBase {
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/AlertWindowsAppOpsTests.java b/tests/framework/base/windowmanager/src/android/server/wm/AlertWindowsAppOpsTests.java
index af08319..ef94f8c 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/AlertWindowsAppOpsTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/AlertWindowsAppOpsTests.java
@@ -55,7 +55,6 @@
* Build/Install/Run:
* atest CtsWindowManagerDeviceTestCases:AlertWindowsAppOpsTests
*/
-@FlakyTest(detail = "Can be promoted to pre-submit once confirmed stable.")
@Presubmit
public class AlertWindowsAppOpsTests {
private static final long APP_OP_CHANGE_TIMEOUT_MILLIS = TimeUnit.SECONDS.toMillis(2);
@@ -141,4 +140,4 @@
// The app op should be reported as started
assertTrue(appOpsManager.isOperationActive(OP_SYSTEM_ALERT_WINDOW, uid, packageName));
}
-}
\ No newline at end of file
+}
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/CrossAppDragAndDropTests.java b/tests/framework/base/windowmanager/src/android/server/wm/CrossAppDragAndDropTests.java
index 4a4098e..3a1619c 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/CrossAppDragAndDropTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/CrossAppDragAndDropTests.java
@@ -67,7 +67,6 @@
*/
@Presubmit
@AppModeFull(reason = "Requires android.permission.MANAGE_ACTIVITY_STACKS")
-@FlakyTest(bugId = 109874623)
public class CrossAppDragAndDropTests {
private static final String TAG = "CrossAppDragAndDrop";
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/LocationInWindowTests.java b/tests/framework/base/windowmanager/src/android/server/wm/LocationInWindowTests.java
index 38acddc..2ebb9bc 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/LocationInWindowTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/LocationInWindowTests.java
@@ -52,7 +52,6 @@
import java.util.function.Supplier;
-@FlakyTest(detail = "until proven non-flaky")
@SmallTest
@Presubmit
public class LocationInWindowTests {
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/WindowFocusTests.java b/tests/framework/base/windowmanager/src/android/server/wm/WindowFocusTests.java
index b2dfbc1..d7166ed 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/WindowFocusTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/WindowFocusTests.java
@@ -249,7 +249,6 @@
* - The window which lost top-focus can be notified about pointer-capture lost.
*/
@Test
- @FlakyTest(bugId = 121122996)
public void testPointerCapture() throws InterruptedException {
final PrimaryActivity primaryActivity = startActivity(PrimaryActivity.class,
DEFAULT_DISPLAY);