diff options
Diffstat (limited to 'tests')
10 files changed, 50 insertions, 148 deletions
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 0e2f5a4798bb..71184c2e0aa2 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 @@ -16,7 +16,6 @@ package com.android.server.wm.flicker.close -import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter @@ -24,7 +23,6 @@ import com.android.server.wm.flicker.FlickerTestParameterFactory import com.android.server.wm.flicker.annotation.Group1 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 @@ -48,30 +46,6 @@ class CloseAppBackButtonTest(testSpec: FlickerTestParameter) : CloseAppTransitio } } - @FlakyTest(bugId = 185401242) - @Test - override fun launcherLayerReplacesApp() { - super.launcherLayerReplacesApp() - } - - @FlakyTest(bugId = 185401242) - @Test - override fun launcherReplacesAppWindowAsTopWindow() { - super.launcherReplacesAppWindowAsTopWindow() - } - - @FlakyTest(bugId = 185401242) - @Test - override fun launcherWindowBecomesVisible() { - super.launcherWindowBecomesVisible() - } - - @FlakyTest(bugId = 185401242) - @Test - override fun noUncoveredRegions() { - super.noUncoveredRegions() - } - companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic 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 95e55a170311..6786279ae107 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.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory import com.android.server.wm.flicker.FlickerTestParameter @@ -24,7 +23,6 @@ import com.android.server.wm.flicker.FlickerTestParameterFactory import com.android.server.wm.flicker.annotation.Group1 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 @@ -48,30 +46,6 @@ class CloseAppHomeButtonTest(testSpec: FlickerTestParameter) : CloseAppTransitio } } - @Postsubmit - @Test - override fun statusBarLayerIsAlwaysVisible() { - super.statusBarLayerIsAlwaysVisible() - } - - @Postsubmit - @Test - override fun statusBarLayerRotatesScales() { - super.statusBarLayerRotatesScales() - } - - @Postsubmit - @Test - override fun launcherLayerReplacesApp() { - super.launcherLayerReplacesApp() - } - - @Postsubmit - @Test - override fun noUncoveredRegions() { - super.noUncoveredRegions() - } - companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic 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 e088062888fb..f7f977d7bd0a 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 android.view.Surface import androidx.test.filters.FlakyTest @@ -83,7 +82,7 @@ abstract class CloseAppTransition(protected val testSpec: FlickerTestParameter) testSpec.navBarLayerIsAlwaysVisible(rotatesScreen = testSpec.isRotated) } - @Postsubmit + @Presubmit @Test open fun statusBarLayerIsAlwaysVisible() { testSpec.statusBarLayerIsAlwaysVisible(rotatesScreen = testSpec.isRotated) @@ -95,7 +94,7 @@ abstract class CloseAppTransition(protected val testSpec: FlickerTestParameter) testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation, Surface.ROTATION_0) } - @Postsubmit + @Presubmit @Test open fun statusBarLayerRotatesScales() { testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation, Surface.ROTATION_0) @@ -117,25 +116,25 @@ abstract class CloseAppTransition(protected val testSpec: FlickerTestParameter) } } - @FlakyTest(bugId = 185400889) + @Presubmit @Test open fun noUncoveredRegions() { testSpec.noUncoveredRegions(testSpec.config.startRotation, Surface.ROTATION_0) } - @FlakyTest(bugId = 185400889) + @Presubmit @Test open fun launcherReplacesAppWindowAsTopWindow() { testSpec.launcherReplacesAppWindowAsTopWindow(testApp) } - @Postsubmit + @Presubmit @Test open fun launcherWindowBecomesVisible() { testSpec.launcherWindowBecomesVisible() } - @FlakyTest(bugId = 185400889) + @Presubmit @Test open fun launcherLayerReplacesApp() { testSpec.launcherLayerReplacesApp(testApp) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt index 013e844c842e..9ff0bdfe66ba 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt @@ -40,7 +40,6 @@ import org.junit.runners.Parameterized @RunWith(Parameterized::class) @Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class) @FixMethodOrder(MethodSorters.NAME_ASCENDING) -@FlakyTest(bugId = 185400889) @Group1 class OpenAppColdTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSpec) { override val transition: FlickerBuilder.(Map<String, Any?>) -> Unit @@ -71,14 +70,32 @@ class OpenAppColdTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp @FlakyTest @Test + override fun navBarLayerIsAlwaysVisible() { + super.navBarLayerIsAlwaysVisible() + } + + @FlakyTest + @Test override fun navBarLayerRotatesAndScales() { super.navBarLayerRotatesAndScales() } @FlakyTest @Test - override fun focusChanges() { - super.focusChanges() + override fun statusBarLayerIsAlwaysVisible() { + super.statusBarLayerIsAlwaysVisible() + } + + @FlakyTest + @Test + override fun appLayerReplacesLauncher() { + super.appLayerReplacesLauncher() + } + + @FlakyTest + @Test + override fun appWindowReplacesLauncherAsTopWindow() { + super.appWindowReplacesLauncherAsTopWindow() } companion object { diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt index 67d54184c64d..b073a7ca1495 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromOverviewTest.kt @@ -16,7 +16,6 @@ package com.android.server.wm.flicker.launch -import android.platform.test.annotations.Presubmit import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory @@ -26,7 +25,6 @@ import com.android.server.wm.flicker.annotation.Group1 import com.android.server.wm.flicker.helpers.reopenAppFromOverview import com.android.server.wm.flicker.helpers.setRotation import com.android.server.wm.flicker.startRotation -import com.android.server.wm.flicker.launcherWindowBecomesInvisible import com.android.server.wm.flicker.dsl.FlickerBuilder import org.junit.FixMethodOrder import org.junit.Test @@ -65,15 +63,16 @@ class OpenAppFromOverviewTest(testSpec: FlickerTestParameter) : OpenAppTransitio } } - @Presubmit + @FlakyTest @Test - override fun appWindowReplacesLauncherAsTopWindow() = - super.appWindowReplacesLauncherAsTopWindow() + override fun navBarLayerIsAlwaysVisible() { + super.navBarLayerIsAlwaysVisible() + } - @Presubmit + @FlakyTest @Test - override fun launcherWindowBecomesInvisible() { - testSpec.launcherWindowBecomesInvisible() + override fun statusBarLayerIsAlwaysVisible() { + super.statusBarLayerIsAlwaysVisible() } @FlakyTest @@ -94,18 +93,6 @@ class OpenAppFromOverviewTest(testSpec: FlickerTestParameter) : OpenAppTransitio super.visibleLayersShownMoreThanOneConsecutiveEntry() } - @FlakyTest - @Test - override fun focusChanges() { - super.focusChanges() - } - - @FlakyTest(bugId = 185400889) - @Test - override fun noUncoveredRegions() { - super.noUncoveredRegions() - } - companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppTransition.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppTransition.kt index 26e77b6c4828..b304d5f999df 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppTransition.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppTransition.kt @@ -19,7 +19,6 @@ package com.android.server.wm.flicker.launch import android.app.Instrumentation import android.platform.test.annotations.Presubmit import android.view.Surface -import androidx.test.filters.FlakyTest import androidx.test.platform.app.InstrumentationRegistry import com.android.server.wm.flicker.FlickerBuilderProvider import com.android.server.wm.flicker.FlickerTestParameter @@ -76,13 +75,13 @@ abstract class OpenAppTransition(protected val testSpec: FlickerTestParameter) { testSpec.navBarWindowIsAlwaysVisible() } - @FlakyTest + @Presubmit @Test open fun navBarLayerIsAlwaysVisible() { testSpec.navBarLayerIsAlwaysVisible(rotatesScreen = testSpec.isRotated) } - @FlakyTest + @Presubmit @Test open fun navBarLayerRotatesAndScales() { testSpec.navBarLayerRotatesAndScales(Surface.ROTATION_0, testSpec.config.endRotation) @@ -94,7 +93,7 @@ abstract class OpenAppTransition(protected val testSpec: FlickerTestParameter) { testSpec.statusBarWindowIsAlwaysVisible() } - @FlakyTest + @Presubmit @Test open fun statusBarLayerIsAlwaysVisible() { testSpec.statusBarLayerIsAlwaysVisible(rotatesScreen = testSpec.isRotated) @@ -135,13 +134,13 @@ abstract class OpenAppTransition(protected val testSpec: FlickerTestParameter) { testSpec.focusChanges("NexusLauncherActivity", testApp.`package`) } - @FlakyTest + @Presubmit @Test open fun appLayerReplacesLauncher() { testSpec.appLayerReplacesLauncher(testApp.`package`) } - @FlakyTest + @Presubmit @Test open fun appWindowReplacesLauncherAsTopWindow() { testSpec.appWindowReplacesLauncherAsTopWindow(testApp) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt index c6dea00a161a..e2705c764917 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt @@ -16,7 +16,6 @@ package com.android.server.wm.flicker.launch -import android.platform.test.annotations.Presubmit import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.FlickerParametersRunnerFactory @@ -68,8 +67,8 @@ class OpenAppWarmTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp @FlakyTest @Test - override fun focusChanges() { - super.focusChanges() + override fun navBarLayerIsAlwaysVisible() { + super.navBarLayerIsAlwaysVisible() } @FlakyTest @@ -78,24 +77,6 @@ class OpenAppWarmTest(testSpec: FlickerTestParameter) : OpenAppTransition(testSp super.navBarLayerRotatesAndScales() } - @FlakyTest - @Test - override fun visibleLayersShownMoreThanOneConsecutiveEntry() { - super.visibleLayersShownMoreThanOneConsecutiveEntry() - } - - @Presubmit - @Test - override fun launcherWindowBecomesInvisible() { - super.launcherWindowBecomesInvisible() - } - - @FlakyTest - @Test - override fun noUncoveredRegions() { - super.noUncoveredRegions() - } - companion object { @Parameterized.Parameters(name = "{0}") @JvmStatic 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 1dbb617b21ba..69e8a8d08e58 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 @@ -55,7 +55,7 @@ class ChangeAppRotationTest( } } - @FlakyTest(bugId = 151179149) + @FlakyTest(bugId = 190185577) @Test override fun focusDoesNotChange() { super.focusDoesNotChange() @@ -63,12 +63,6 @@ class ChangeAppRotationTest( @Postsubmit @Test - override fun noUncoveredRegions() { - super.noUncoveredRegions() - } - - @FlakyTest - @Test fun screenshotLayerBecomesInvisible() { testSpec.assertLayers { this.isVisible(testApp.getPackage()) @@ -81,14 +75,8 @@ class ChangeAppRotationTest( @Postsubmit @Test - override fun appLayerRotates_EndingPos() { - super.appLayerRotates_EndingPos() - } - - @Postsubmit - @Test - override fun appLayerRotates_StartingPos() { - super.appLayerRotates_StartingPos() + override fun statusBarLayerRotatesScales() { + super.statusBarLayerRotatesScales() } @Presubmit @@ -97,18 +85,12 @@ class ChangeAppRotationTest( super.navBarWindowIsAlwaysVisible() } - @Postsubmit + @FlakyTest @Test override fun statusBarLayerIsAlwaysVisible() { super.statusBarLayerIsAlwaysVisible() } - @Postsubmit - @Test - override fun statusBarWindowIsAlwaysVisible() { - super.statusBarWindowIsAlwaysVisible() - } - companion object { private const val SCREENSHOT_LAYER = "RotationLayer" diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/RotationTransition.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/RotationTransition.kt index ab8ebd923fd3..4b888cd5aad0 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/RotationTransition.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/RotationTransition.kt @@ -88,7 +88,7 @@ abstract class RotationTransition(protected val testSpec: FlickerTestParameter) testSpec.config.startRotation, testSpec.config.endRotation) } - @FlakyTest + @Presubmit @Test open fun statusBarWindowIsAlwaysVisible() { testSpec.statusBarWindowIsAlwaysVisible() @@ -128,7 +128,7 @@ abstract class RotationTransition(protected val testSpec: FlickerTestParameter) } } - @FlakyTest + @Presubmit @Test open fun noUncoveredRegions() { testSpec.noUncoveredRegions(testSpec.config.startRotation, @@ -141,7 +141,7 @@ abstract class RotationTransition(protected val testSpec: FlickerTestParameter) testSpec.focusDoesNotChange() } - @FlakyTest + @Presubmit @Test open fun appLayerRotates_StartingPos() { testSpec.assertLayersStart { @@ -149,7 +149,7 @@ abstract class RotationTransition(protected val testSpec: FlickerTestParameter) } } - @FlakyTest + @Presubmit @Test open fun appLayerRotates_EndingPos() { testSpec.assertLayersEnd { diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/SeamlessAppRotationTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/SeamlessAppRotationTest.kt index 462710711bca..b153bece1133 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/SeamlessAppRotationTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/rotation/SeamlessAppRotationTest.kt @@ -17,6 +17,7 @@ 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 import com.android.server.wm.flicker.FlickerParametersRunnerFactory @@ -71,13 +72,7 @@ class SeamlessAppRotationTest( super.statusBarLayerIsAlwaysVisible() } - @FlakyTest(bugId = 185400889) - @Test - override fun noUncoveredRegions() { - super.noUncoveredRegions() - } - - @FlakyTest(bugId = 185400889) + @Presubmit @Test fun appLayerAlwaysVisible() { testSpec.assertLayers { @@ -97,12 +92,6 @@ class SeamlessAppRotationTest( @Postsubmit @Test - override fun navBarWindowIsAlwaysVisible() { - super.navBarWindowIsAlwaysVisible() - } - - @Postsubmit - @Test override fun visibleLayersShownMoreThanOneConsecutiveEntry() { super.visibleLayersShownMoreThanOneConsecutiveEntry() } |