From 730f398b1710cb41068c55b1a1cebfc6b21e3095 Mon Sep 17 00:00:00 2001 From: Ioana Moraru Date: Fri, 24 Sep 2021 10:00:52 +0000 Subject: [PATCH] Promote stable postsubmit tests to presubmit Tests were stable in the dashboard for a few days. Bug: 196213706 Test: atest WMShellFlickerTests Test: atest FlickerTests Change-Id: I8107bccf8b340285b1f4062908df1ab8500596bf --- .../shell/flicker/pip/ExitPipWithDismissButtonTest.kt | 11 ----------- .../server/wm/flicker/close/CloseAppBackButtonTest.kt | 6 ------ .../server/wm/flicker/close/CloseAppHomeButtonTest.kt | 6 ------ .../wm/flicker/ime/LaunchAppShowImeOnStartTest.kt | 10 +++++----- 4 files changed, 5 insertions(+), 28 deletions(-) diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipWithDismissButtonTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipWithDismissButtonTest.kt index 92867da88599a..73626c23065a0 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipWithDismissButtonTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipWithDismissButtonTest.kt @@ -16,8 +16,6 @@ package com.android.wm.shell.flicker.pip -import android.platform.test.annotations.Postsubmit -import android.platform.test.annotations.Presubmit import android.view.Surface import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory @@ -26,7 +24,6 @@ import com.android.server.wm.flicker.FlickerTestParameterFactory import com.android.server.wm.flicker.annotation.Group3 import com.android.server.wm.flicker.dsl.FlickerBuilder import org.junit.FixMethodOrder -import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.MethodSorters import org.junit.runners.Parameterized @@ -63,14 +60,6 @@ class ExitPipWithDismissButtonTest(testSpec: FlickerTestParameter) : ExitPipTran } } - @Presubmit - @Test - override fun pipLayerBecomesInvisible() = super.pipLayerBecomesInvisible() - - @Postsubmit - @Test - override fun pipWindowBecomesInvisible() = super.pipWindowBecomesInvisible() - companion object { /** * Creates the test configurations. diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppBackButtonTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppBackButtonTest.kt index 9b34853092a2a..9f26c31a6d63c 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppBackButtonTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppBackButtonTest.kt @@ -17,7 +17,6 @@ package com.android.server.wm.flicker.close -import android.platform.test.annotations.Postsubmit import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory @@ -80,11 +79,6 @@ class CloseAppBackButtonTest(testSpec: FlickerTestParameter) : CloseAppTransitio @Test override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales() - /** {@inheritDoc} */ - @Postsubmit - @Test - override fun navBarLayerIsVisible() = super.navBarLayerIsVisible() - companion object { /** * Creates the test configurations. diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt index e380794906185..795766fccfbd6 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt @@ -16,7 +16,6 @@ package com.android.server.wm.flicker.close -import android.platform.test.annotations.Postsubmit import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory @@ -79,11 +78,6 @@ class CloseAppHomeButtonTest(testSpec: FlickerTestParameter) : CloseAppTransitio @Test override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales() - /** {@inheritDoc} */ - @Postsubmit - @Test - override fun navBarLayerIsVisible() = super.navBarLayerIsVisible() - companion object { /** * Creates the test configurations. diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/LaunchAppShowImeOnStartTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/LaunchAppShowImeOnStartTest.kt index bcb4417e55a88..a9568b325af2e 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/LaunchAppShowImeOnStartTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/LaunchAppShowImeOnStartTest.kt @@ -17,7 +17,7 @@ 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.RequiresDevice @@ -96,21 +96,21 @@ class LaunchAppShowImeOnStartTest(private val testSpec: FlickerTestParameter) { /** * Checks that [FlickerComponentName.IME] window becomes visible during the transition */ - @Postsubmit + @Presubmit @Test fun imeWindowBecomesVisible() = testSpec.imeWindowBecomesVisible() /** * Checks that [FlickerComponentName.IME] layer becomes visible during the transition */ - @Postsubmit + @Presubmit @Test fun imeLayerBecomesVisible() = testSpec.imeLayerBecomesVisible() /** * Checks that [FlickerComponentName.IME] layer is invisible at the start of the transition */ - @Postsubmit + @Presubmit @Test fun imeLayerNotExistsStart() { testSpec.assertLayersStart { @@ -121,7 +121,7 @@ class LaunchAppShowImeOnStartTest(private val testSpec: FlickerTestParameter) { /** * Checks that [FlickerComponentName.IME] layer is visible at the end of the transition */ - @Postsubmit + @Presubmit @Test fun imeLayerExistsEnd() { testSpec.assertLayersEnd {