From e4db4e554253168ae6d9ad18d9970fd04ddb4b7e Mon Sep 17 00:00:00 2001 From: Pablo Gamito Date: Thu, 8 Sep 2022 13:47:53 +0000 Subject: [PATCH] Promote stable Flicker tests Test: atest FlickerTests Bug: 239148258 Bug: 228009808 Bug: 239147075 Change-Id: Ieea545eaf7ed30c7cdd9b25f78146a6129e7bb53 --- .../QuickSwitchBetweenTwoAppsBackTest.kt | 3 +-- ...itchBetweenTwoAppsBackTest_ShellTransit.kt | 24 ------------------- .../QuickSwitchBetweenTwoAppsForwardTest.kt | 16 +------------ ...hBetweenTwoAppsForwardTest_ShellTransit.kt | 14 ----------- .../QuickSwitchFromLauncherTest.kt | 15 +----------- 5 files changed, 3 insertions(+), 69 deletions(-) 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 f85bad33c4fd1..aaace590bfa90 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 @@ -16,7 +16,6 @@ package com.android.server.wm.flicker.quickswitch -import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.Presubmit import android.platform.test.annotations.RequiresDevice import android.view.Surface @@ -266,7 +265,7 @@ open class QuickSwitchBetweenTwoAppsBackTest( } /** {@inheritDoc} */ - @Postsubmit + @Presubmit @Test override fun taskBarLayerIsVisibleAtStartAndEnd() = super.taskBarLayerIsVisibleAtStartAndEnd() diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsBackTest_ShellTransit.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsBackTest_ShellTransit.kt index 461bae482299f..49dcbcf10e155 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsBackTest_ShellTransit.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsBackTest_ShellTransit.kt @@ -16,7 +16,6 @@ package com.android.server.wm.flicker.quickswitch -import android.platform.test.annotations.FlakyTest import android.platform.test.annotations.Presubmit import android.platform.test.annotations.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory @@ -57,29 +56,6 @@ open class QuickSwitchBetweenTwoAppsBackTest_ShellTransit( Assume.assumeTrue(isShellTransitionsEnabled) } - @FlakyTest(bugId = 228009808) - @Test - override fun app1LayerIsVisibleOnceApp2LayerIsInvisible() = - super.app1LayerIsVisibleOnceApp2LayerIsInvisible() - - @FlakyTest(bugId = 228009808) - @Test - override fun app1WindowBecomesAndStaysVisible() = super.app1WindowBecomesAndStaysVisible() - - @FlakyTest(bugId = 228009808) - @Test - override fun endsWithApp1BeingOnTop() = super.endsWithApp1BeingOnTop() - - @FlakyTest(bugId = 239147075) - @Test - override fun visibleLayersShownMoreThanOneConsecutiveEntry() = - super.visibleLayersShownMoreThanOneConsecutiveEntry() - - @FlakyTest(bugId = 239147075) - @Test - override fun visibleWindowsShownMoreThanOneConsecutiveEntry() = - super.visibleWindowsShownMoreThanOneConsecutiveEntry() - /** {@inheritDoc} */ @Ignore("Nav bar window becomes invisible during quick switch") @Test 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 f6392cab4a357..bb656e834eb20 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 @@ -16,8 +16,6 @@ package com.android.server.wm.flicker.quickswitch -import android.platform.test.annotations.FlakyTest -import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.Presubmit import android.platform.test.annotations.RequiresDevice import android.view.Surface @@ -274,22 +272,10 @@ open class QuickSwitchBetweenTwoAppsForwardTest( } /** {@inheritDoc} */ - @Postsubmit + @Presubmit @Test override fun taskBarLayerIsVisibleAtStartAndEnd() = super.taskBarLayerIsVisibleAtStartAndEnd() - /** {@inheritDoc} */ - @FlakyTest(bugId = 239148258) - @Test - override fun visibleLayersShownMoreThanOneConsecutiveEntry() = - super.visibleLayersShownMoreThanOneConsecutiveEntry() - - /** {@inheritDoc} */ - @FlakyTest(bugId = 239148258) - @Test - override fun visibleWindowsShownMoreThanOneConsecutiveEntry() = - super.visibleWindowsShownMoreThanOneConsecutiveEntry() - companion object { private var startDisplayBounds = Rect.EMPTY diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsForwardTest_ShellTransit.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsForwardTest_ShellTransit.kt index f644b97e03dff..7c7be89f5108b 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsForwardTest_ShellTransit.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchBetweenTwoAppsForwardTest_ShellTransit.kt @@ -16,7 +16,6 @@ package com.android.server.wm.flicker.quickswitch -import android.platform.test.annotations.FlakyTest import android.platform.test.annotations.Presubmit import android.platform.test.annotations.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory @@ -57,19 +56,6 @@ open class QuickSwitchBetweenTwoAppsForwardTest_ShellTransit( Assume.assumeTrue(isShellTransitionsEnabled) } - @FlakyTest(bugId = 228009808) - @Test - override fun app2LayerIsVisibleOnceApp1LayerIsInvisible() = - super.app2LayerIsVisibleOnceApp1LayerIsInvisible() - - @FlakyTest(bugId = 228009808) - @Test - override fun app2WindowBecomesAndStaysVisible() = super.app2WindowBecomesAndStaysVisible() - - @FlakyTest(bugId = 228009808) - @Test - override fun endsWithApp2BeingOnTop() = super.endsWithApp2BeingOnTop() - /** {@inheritDoc} */ @Ignore("Nav bar window becomes invisible during quick switch") @Test diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchFromLauncherTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchFromLauncherTest.kt index a714111fae21b..13c9e2b586c4d 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchFromLauncherTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/quickswitch/QuickSwitchFromLauncherTest.kt @@ -16,8 +16,6 @@ package com.android.server.wm.flicker.quickswitch -import android.platform.test.annotations.FlakyTest -import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.Presubmit import android.platform.test.annotations.RequiresDevice import android.view.Surface @@ -284,21 +282,10 @@ class QuickSwitchFromLauncherTest(testSpec: FlickerTestParameter) : BaseTest(tes } /** {@inheritDoc} */ - @Postsubmit + @Presubmit @Test override fun taskBarLayerIsVisibleAtStartAndEnd() = super.taskBarLayerIsVisibleAtStartAndEnd() - /** {@inheritDoc} */ - @FlakyTest(bugId = 239148258) - @Test - override fun visibleLayersShownMoreThanOneConsecutiveEntry() = - super.visibleLayersShownMoreThanOneConsecutiveEntry() - - @FlakyTest(bugId = 239148258) - @Test - override fun visibleWindowsShownMoreThanOneConsecutiveEntry() = - super.visibleWindowsShownMoreThanOneConsecutiveEntry() - /** {@inheritDoc} */ @Ignore("Nav bar window becomes invisible during quick switch") @Test