From 3968a53df532970520b93ab615e8a12738ddcb99 Mon Sep 17 00:00:00 2001 From: Nataniel Borges Date: Fri, 19 Nov 2021 14:15:18 +0100 Subject: [PATCH] Promote/demote stable/flaky flicker tests Also downgrade all FASS assertions to flaky Promote: - stable postsubmit to presubmit - stable flaky to postsubmit Demote: - unstable postsubmit to flaky Test: atest FlickerTests WMShellFlickerTests Change-Id: I9e43398b8b00286ce74d4c41505124512bed7eeb --- ...AppPairsTestCannotPairNonResizeableApps.kt | 3 ++- ...AppPairsTestPairPrimaryAndSecondaryApps.kt | 3 ++- ...ppPairsTestSupportPairNonResizeableApps.kt | 3 ++- ...pPairsTestUnpairPrimaryAndSecondaryApps.kt | 3 ++- .../RotateTwoLaunchedAppsInAppPairsMode.kt | 4 ++-- ...oLaunchedAppsRotateAndEnterAppPairsMode.kt | 6 ++--- .../flicker/bubble/DismissBubbleScreen.kt | 4 ++-- .../flicker/bubble/LaunchBubbleScreen.kt | 4 ++-- .../ExitLegacySplitScreenFromBottom.kt | 7 +++--- ...tScreenFromRecentNotSupportNonResizable.kt | 4 ++-- .../LegacySplitScreenToLauncher.kt | 8 +++---- .../SetRequestedOrientationWhilePinnedTest.kt | 23 ++++++++++--------- .../wm/flicker/close/CloseAppTransition.kt | 5 ++-- .../ime/CloseImeAutoOpenWindowToHomeTest.kt | 4 ++-- .../flicker/ime/CloseImeWindowToHomeTest.kt | 4 ++-- .../wm/flicker/ime/OpenImeWindowTest.kt | 4 ++-- .../launch/OpenAppNonResizeableTest.kt | 8 +++---- .../QuickSwitchBetweenTwoAppsBackTest.kt | 11 +++++---- .../QuickSwitchBetweenTwoAppsForwardTest.kt | 9 ++++---- .../flicker/rotation/ChangeAppRotationTest.kt | 5 ++-- 20 files changed, 63 insertions(+), 59 deletions(-) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestCannotPairNonResizeableApps.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestCannotPairNonResizeableApps.kt index 1d463d57e44ce..e6c2f38ec3cbe 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestCannotPairNonResizeableApps.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestCannotPairNonResizeableApps.kt @@ -16,6 +16,7 @@ package com.android.wm.shell.flicker.apppairs +import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.Presubmit import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice @@ -82,7 +83,7 @@ class AppPairsTestCannotPairNonResizeableApps( @Test override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales() - @FlakyTest + @Postsubmit @Test override fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestPairPrimaryAndSecondaryApps.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestPairPrimaryAndSecondaryApps.kt index 10cf0b7c4773a..1a3e42cbe04cb 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestPairPrimaryAndSecondaryApps.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestPairPrimaryAndSecondaryApps.kt @@ -16,6 +16,7 @@ package com.android.wm.shell.flicker.apppairs +import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.Presubmit import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice @@ -67,7 +68,7 @@ class AppPairsTestPairPrimaryAndSecondaryApps( @Test override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales() - @FlakyTest + @Postsubmit @Test override fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestSupportPairNonResizeableApps.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestSupportPairNonResizeableApps.kt index 722ec34670cf2..5c78b2998d600 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestSupportPairNonResizeableApps.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestSupportPairNonResizeableApps.kt @@ -16,6 +16,7 @@ package com.android.wm.shell.flicker.apppairs +import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.Presubmit import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice @@ -86,7 +87,7 @@ class AppPairsTestSupportPairNonResizeableApps( @Test override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales() - @FlakyTest + @Postsubmit @Test override fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestUnpairPrimaryAndSecondaryApps.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestUnpairPrimaryAndSecondaryApps.kt index 38c008c14a78d..251d92d4f0081 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestUnpairPrimaryAndSecondaryApps.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/AppPairsTestUnpairPrimaryAndSecondaryApps.kt @@ -17,6 +17,7 @@ package com.android.wm.shell.flicker.apppairs import android.os.SystemClock +import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.Presubmit import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice @@ -71,7 +72,7 @@ class AppPairsTestUnpairPrimaryAndSecondaryApps( @Test override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales() - @FlakyTest + @Postsubmit @Test override fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsInAppPairsMode.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsInAppPairsMode.kt index 13824b864ff12..d47057fb3bae3 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsInAppPairsMode.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsInAppPairsMode.kt @@ -16,9 +16,9 @@ package com.android.wm.shell.flicker.apppairs +import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.Presubmit import android.view.Surface -import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter @@ -87,7 +87,7 @@ class RotateTwoLaunchedAppsInAppPairsMode( testSpec.appPairsPrimaryBoundsIsVisibleAtEnd(testSpec.endRotation, primaryApp.component) - @FlakyTest + @Postsubmit @Test fun appPairsSecondaryBoundsIsVisibleAtEnd() = testSpec.appPairsSecondaryBoundsIsVisibleAtEnd(testSpec.endRotation, diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsRotateAndEnterAppPairsMode.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsRotateAndEnterAppPairsMode.kt index c003084e35838..097867a95fb73 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsRotateAndEnterAppPairsMode.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/apppairs/RotateTwoLaunchedAppsRotateAndEnterAppPairsMode.kt @@ -16,9 +16,9 @@ package com.android.wm.shell.flicker.apppairs +import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.Presubmit import android.view.Surface -import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter @@ -89,13 +89,13 @@ class RotateTwoLaunchedAppsRotateAndEnterAppPairsMode( } } - @FlakyTest(bugId = 172776659) + @Postsubmit @Test fun appPairsPrimaryBoundsIsVisibleAtEnd() = testSpec.appPairsPrimaryBoundsIsVisibleAtEnd(testSpec.endRotation, primaryApp.component) - @FlakyTest(bugId = 172776659) + @Postsubmit @Test fun appPairsSecondaryBoundsIsVisibleAtEnd() = testSpec.appPairsSecondaryBoundsIsVisibleAtEnd(testSpec.endRotation, diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/DismissBubbleScreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/DismissBubbleScreen.kt index 1605d80347967..a928bbdb288f7 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/DismissBubbleScreen.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/DismissBubbleScreen.kt @@ -18,7 +18,7 @@ package com.android.wm.shell.flicker.bubble import android.content.Context import android.graphics.Point -import android.platform.test.annotations.Postsubmit +import android.platform.test.annotations.Presubmit import android.util.DisplayMetrics import android.view.WindowManager import androidx.test.filters.RequiresDevice @@ -66,7 +66,7 @@ class DismissBubbleScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen(tes } } - @Postsubmit + @Presubmit @Test fun testAppIsAlwaysVisible() { testSpec.assertLayers { diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/LaunchBubbleScreen.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/LaunchBubbleScreen.kt index a8f17a75dbb35..64636be1195f8 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/LaunchBubbleScreen.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/bubble/LaunchBubbleScreen.kt @@ -16,7 +16,7 @@ package com.android.wm.shell.flicker.bubble -import android.platform.test.annotations.Postsubmit +import android.platform.test.annotations.Presubmit import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter @@ -49,7 +49,7 @@ class LaunchBubbleScreen(testSpec: FlickerTestParameter) : BaseBubbleScreen(test } } - @Postsubmit + @Presubmit @Test fun testAppIsAlwaysVisible() { testSpec.assertLayers { diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitLegacySplitScreenFromBottom.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitLegacySplitScreenFromBottom.kt index 3885155054628..ef7d65e8a7326 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitLegacySplitScreenFromBottom.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/ExitLegacySplitScreenFromBottom.kt @@ -16,7 +16,6 @@ package com.android.wm.shell.flicker.legacysplitscreen -import android.platform.test.annotations.Postsubmit import android.view.Surface import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice @@ -74,7 +73,7 @@ class ExitLegacySplitScreenFromBottom( splitScreenApp.component, secondaryApp.component, FlickerComponentName.SNAPSHOT) - @Postsubmit + @FlakyTest @Test fun layerBecomesInvisible() { testSpec.assertLayers { @@ -94,11 +93,11 @@ class ExitLegacySplitScreenFromBottom( } } - @Postsubmit + @FlakyTest @Test fun navBarWindowIsVisible() = testSpec.navBarWindowIsVisible() - @Postsubmit + @FlakyTest @Test fun statusBarWindowIsVisible() = testSpec.statusBarWindowIsVisible() diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenFromRecentNotSupportNonResizable.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenFromRecentNotSupportNonResizable.kt index 079a6efdd31f0..c1fba7d1530c3 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenFromRecentNotSupportNonResizable.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenFromRecentNotSupportNonResizable.kt @@ -16,9 +16,9 @@ package com.android.wm.shell.flicker.legacysplitscreen -import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.Presubmit import android.view.Surface +import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter @@ -124,7 +124,7 @@ class LegacySplitScreenFromRecentNotSupportNonResizable( } } - @Postsubmit + @FlakyTest @Test fun nonResizableAppWindowBecomesVisible() { testSpec.assertWm { diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenToLauncher.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenToLauncher.kt index a787f2bdfc811..77fb101acc6a4 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenToLauncher.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/LegacySplitScreenToLauncher.kt @@ -16,9 +16,9 @@ package com.android.wm.shell.flicker.legacysplitscreen -import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.Presubmit import android.view.Surface +import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter @@ -122,11 +122,11 @@ class LegacySplitScreenToLauncher( @Test fun statusBarLayerIsVisible() = testSpec.statusBarLayerIsVisible() - @Postsubmit + @FlakyTest @Test fun dockedStackDividerBecomesInvisible() = testSpec.dockedStackDividerBecomesInvisible() - @Postsubmit + @FlakyTest @Test fun layerBecomesInvisible() { testSpec.assertLayers { @@ -136,7 +136,7 @@ class LegacySplitScreenToLauncher( } } - @Postsubmit + @FlakyTest @Test fun focusDoesNotChange() { testSpec.assertEventLog { diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTest.kt index 9c261051896a2..a940a7f0fcc33 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/SetRequestedOrientationWhilePinnedTest.kt @@ -16,6 +16,7 @@ package com.android.wm.shell.flicker.pip +import android.platform.test.annotations.Postsubmit import android.view.Surface import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice @@ -82,19 +83,19 @@ class SetRequestedOrientationWhilePinnedTest( } } - @FlakyTest + @Postsubmit @Test override fun navBarLayerIsVisible() = super.navBarLayerIsVisible() - @FlakyTest + @Postsubmit @Test override fun navBarWindowIsVisible() = super.navBarWindowIsVisible() - @FlakyTest + @Postsubmit @Test override fun statusBarLayerIsVisible() = super.statusBarLayerIsVisible() - @FlakyTest + @Postsubmit @Test override fun statusBarWindowIsVisible() = super.statusBarWindowIsVisible() @@ -102,7 +103,7 @@ class SetRequestedOrientationWhilePinnedTest( @Test override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales() - @FlakyTest + @Postsubmit @Test override fun statusBarLayerRotatesScales() { // This test doesn't work in shell transitions because of b/206753786 @@ -110,7 +111,7 @@ class SetRequestedOrientationWhilePinnedTest( super.statusBarLayerRotatesScales() } - @FlakyTest + @Postsubmit @Test fun pipWindowInsideDisplay() { testSpec.assertWmStart { @@ -118,7 +119,7 @@ class SetRequestedOrientationWhilePinnedTest( } } - @FlakyTest + @Postsubmit @Test fun pipAppShowsOnTop() { testSpec.assertWmEnd { @@ -126,7 +127,7 @@ class SetRequestedOrientationWhilePinnedTest( } } - @FlakyTest + @Postsubmit @Test fun pipLayerInsideDisplay() { testSpec.assertLayersStart { @@ -134,13 +135,13 @@ class SetRequestedOrientationWhilePinnedTest( } } - @FlakyTest + @Postsubmit @Test fun pipAlwaysVisible() = testSpec.assertWm { this.isAppWindowVisible(pipApp.component) } - @FlakyTest + @Postsubmit @Test fun pipAppLayerCoversFullScreen() { testSpec.assertLayersEnd { @@ -148,7 +149,7 @@ class SetRequestedOrientationWhilePinnedTest( } } - @FlakyTest + @Postsubmit @Test override fun entireScreenCovered() = super.entireScreenCovered() diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppTransition.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppTransition.kt index 3c9ba20c340af..ca73503164e6c 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppTransition.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppTransition.kt @@ -17,7 +17,6 @@ package com.android.server.wm.flicker.close import android.app.Instrumentation -import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.Presubmit import androidx.test.filters.FlakyTest import androidx.test.platform.app.InstrumentationRegistry @@ -196,13 +195,13 @@ abstract class CloseAppTransition(protected val testSpec: FlickerTestParameter) testSpec.replacesLayer(testApp.component, LAUNCHER_COMPONENT) } - @Postsubmit + @FlakyTest @Test fun runPresubmitAssertion() { flickerRule.checkPresubmitAssertions() } - @Postsubmit + @FlakyTest @Test fun runPostsubmitAssertion() { flickerRule.checkPostsubmitAssertions() diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt index b1bdb31670994..39d2518033c74 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt @@ -17,10 +17,10 @@ package com.android.server.wm.flicker.ime import android.app.Instrumentation +import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.Presubmit import android.view.Surface import android.view.WindowManagerPolicyConstants -import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import androidx.test.platform.app.InstrumentationRegistry import com.android.server.wm.flicker.FlickerBuilderProvider @@ -105,7 +105,7 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete } } - @FlakyTest(bugId = 190189685) + @Postsubmit @Test fun imeAppWindowBecomesInvisible() { testSpec.assertWm { diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt index ac907525ac13a..61fe02e05152a 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt @@ -17,10 +17,10 @@ package com.android.server.wm.flicker.ime import android.app.Instrumentation +import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.Presubmit import android.view.Surface import android.view.WindowManagerPolicyConstants -import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import androidx.test.platform.app.InstrumentationRegistry import com.android.server.wm.flicker.FlickerBuilderProvider @@ -106,7 +106,7 @@ class CloseImeWindowToHomeTest(private val testSpec: FlickerTestParameter) { @Test fun imeWindowBecomesInvisible() = testSpec.imeWindowBecomesInvisible() - @FlakyTest + @Postsubmit @Test fun imeAppWindowBecomesInvisible() { testSpec.assertWm { diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTest.kt index cc5d9d2b20b59..1c149162291b5 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTest.kt @@ -17,10 +17,10 @@ package com.android.server.wm.flicker.ime import android.app.Instrumentation +import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.Presubmit import android.view.Surface import android.view.WindowManagerPolicyConstants -import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import androidx.test.platform.app.InstrumentationRegistry import com.android.server.wm.flicker.FlickerBuilderProvider @@ -144,7 +144,7 @@ class OpenImeWindowTest(private val testSpec: FlickerTestParameter) { } } - @FlakyTest + @Postsubmit @Test fun visibleWindowsShownMoreThanOneConsecutiveEntry() { testSpec.assertWm { diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppNonResizeableTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppNonResizeableTest.kt index 429841bf47362..61fe07a179011 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppNonResizeableTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppNonResizeableTest.kt @@ -110,7 +110,7 @@ class OpenAppNonResizeableTest(testSpec: FlickerTestParameter) : OpenAppTransiti * Checks that the app layer doesn't exist at the start of the transition, that it is * created (invisible) and becomes visible during the transition */ - @FlakyTest + @Postsubmit @Test fun appLayerBecomesVisible() { testSpec.assertLayers { @@ -169,7 +169,7 @@ class OpenAppNonResizeableTest(testSpec: FlickerTestParameter) : OpenAppTransiti } /** {@inheritDoc} */ - @FlakyTest + @Postsubmit @Test override fun statusBarWindowIsVisible() = super.statusBarWindowIsVisible() @@ -211,7 +211,7 @@ class OpenAppNonResizeableTest(testSpec: FlickerTestParameter) : OpenAppTransiti } /** {@inheritDoc} */ - @FlakyTest + @Postsubmit @Test override fun visibleWindowsShownMoreThanOneConsecutiveEntry() = super.visibleWindowsShownMoreThanOneConsecutiveEntry() @@ -227,7 +227,7 @@ class OpenAppNonResizeableTest(testSpec: FlickerTestParameter) : OpenAppTransiti super.visibleLayersShownMoreThanOneConsecutiveEntry() /** {@inheritDoc} */ - @Postsubmit + @FlakyTest @Test override fun entireScreenCovered() = super.entireScreenCovered() diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsBackTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsBackTest.kt index 5b0372d1be257..0a64939cb4ca2 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsBackTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsBackTest.kt @@ -18,6 +18,7 @@ package com.android.server.wm.flicker.quickswitch import android.app.Instrumentation import android.platform.test.annotations.Postsubmit +import android.platform.test.annotations.Presubmit import android.platform.test.annotations.RequiresDevice import android.view.Surface import android.view.WindowManagerPolicyConstants @@ -133,7 +134,7 @@ class QuickSwitchBetweenTwoAppsBackTest(private val testSpec: FlickerTestParamet /** * Checks that the transition starts with [testApp2] being the top window. */ - @Postsubmit + @Presubmit @Test fun startsWithApp2WindowBeingOnTop() { testSpec.assertWmStart { @@ -284,7 +285,7 @@ class QuickSwitchBetweenTwoAppsBackTest(private val testSpec: FlickerTestParamet /** * Checks that the navbar layer is visible throughout the entire transition. */ - @Postsubmit + @Presubmit @Test fun navBarLayerAlwaysIsVisible() = testSpec.navBarLayerIsVisible() @@ -293,21 +294,21 @@ class QuickSwitchBetweenTwoAppsBackTest(private val testSpec: FlickerTestParamet * * NOTE: This doesn't check that the navbar is visible or not. */ - @Postsubmit + @Presubmit @Test fun navbarIsAlwaysInRightPosition() = testSpec.navBarLayerRotatesAndScales() /** * Checks that the status bar window is visible throughout the entire transition. */ - @Postsubmit + @Presubmit @Test fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsVisible() /** * Checks that the status bar layer is visible throughout the entire transition. */ - @Postsubmit + @Presubmit @Test fun statusBarLayerIsAlwaysVisible() = testSpec.statusBarLayerIsVisible() diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsForwardTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsForwardTest.kt index 99bc1155233d2..5b633764a3804 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsForwardTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsForwardTest.kt @@ -18,6 +18,7 @@ package com.android.server.wm.flicker.quickswitch import android.app.Instrumentation import android.platform.test.annotations.Postsubmit +import android.platform.test.annotations.Presubmit import android.platform.test.annotations.RequiresDevice import android.view.Surface import android.view.WindowManagerPolicyConstants @@ -298,7 +299,7 @@ class QuickSwitchBetweenTwoAppsForwardTest(private val testSpec: FlickerTestPara /** * Checks that the navbar layer is visible throughout the entire transition. */ - @Postsubmit + @Presubmit @Test fun navBarLayerAlwaysIsVisible() = testSpec.navBarLayerIsVisible() @@ -307,21 +308,21 @@ class QuickSwitchBetweenTwoAppsForwardTest(private val testSpec: FlickerTestPara * * NOTE: This doesn't check that the navbar is visible or not. */ - @Postsubmit + @Presubmit @Test fun navbarIsAlwaysInRightPosition() = testSpec.navBarLayerRotatesAndScales() /** * Checks that the status bar window is visible throughout the entire transition. */ - @Postsubmit + @Presubmit @Test fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsVisible() /** * Checks that the status bar layer is visible throughout the entire transition. */ - @Postsubmit + @Presubmit @Test fun statusBarLayerIsAlwaysVisible() = testSpec.statusBarLayerIsVisible() diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt index a97a48eb6b199..cac7978d8c44d 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt @@ -16,7 +16,6 @@ package com.android.server.wm.flicker.rotation -import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.Presubmit import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice @@ -97,13 +96,13 @@ class ChangeAppRotationTest( } } - @Postsubmit + @FlakyTest @Test fun runPresubmitAssertion() { flickerRule.checkPresubmitAssertions() } - @Postsubmit + @FlakyTest @Test fun runPostsubmitAssertion() { flickerRule.checkPostsubmitAssertions()