From 256db627736ac9a07fee7779e976c6d793fa813e Mon Sep 17 00:00:00 2001 From: Nataniel Borges Date: Wed, 11 Jan 2023 15:39:44 +0000 Subject: [PATCH] Promote passing IME tests and move flaky postsubmit to flaky Bug: 240918620 Bug: 265016201 Test: atest FlickerTest Change-Id: I717c1d3f588b0e844af31381cb64f76d56b1bfd0 --- .../LaunchAppShowImeAndDialogThemeAppTest.kt | 11 ----- ...penImeWindowFromFixedOrientationAppTest.kt | 18 +------ .../ime/SwitchImeWindowsFromGestureNavTest.kt | 47 +------------------ 3 files changed, 4 insertions(+), 72 deletions(-) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/LaunchAppShowImeAndDialogThemeAppTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/LaunchAppShowImeAndDialogThemeAppTest.kt index da3c62daccd9a..cb530dadc493f 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/LaunchAppShowImeAndDialogThemeAppTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/LaunchAppShowImeAndDialogThemeAppTest.kt @@ -16,7 +16,6 @@ package com.android.server.wm.flicker.ime -import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.Presubmit import android.view.WindowInsets.Type.ime import android.view.WindowInsets.Type.navigationBars @@ -64,16 +63,6 @@ class LaunchAppShowImeAndDialogThemeAppTest(flicker: FlickerTest) : BaseTest(fli transitions { testApp.dismissDialog(wmHelper) } } - /** {@inheritDoc} */ - @Postsubmit - @Test - override fun taskBarWindowIsAlwaysVisible() = super.taskBarWindowIsAlwaysVisible() - - /** {@inheritDoc} */ - @Postsubmit - @Test - override fun taskBarLayerIsVisibleAtStartAndEnd() = super.taskBarLayerIsVisibleAtStartAndEnd() - /** Checks that [ComponentNameMatcher.IME] layer becomes visible during the transition */ @Presubmit @Test fun imeWindowIsAlwaysVisible() = flicker.imeWindowIsAlwaysVisible() diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowFromFixedOrientationAppTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowFromFixedOrientationAppTest.kt index c2526d3fff589..0e732b550d2eb 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowFromFixedOrientationAppTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowFromFixedOrientationAppTest.kt @@ -16,7 +16,7 @@ package com.android.server.wm.flicker.ime -import android.platform.test.annotations.Postsubmit +import android.platform.test.annotations.FlakyTest import android.platform.test.annotations.Presubmit import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.BaseTest @@ -68,25 +68,11 @@ class OpenImeWindowFromFixedOrientationAppTest(flicker: FlickerTest) : BaseTest( teardown { imeTestApp.exit(wmHelper) } } - /** {@inheritDoc} */ - @Postsubmit - @Test - override fun navBarLayerIsVisibleAtStartAndEnd() = super.navBarLayerIsVisibleAtStartAndEnd() - - @Postsubmit - @Test - override fun navBarLayerPositionAtStartAndEnd() = super.navBarLayerPositionAtStartAndEnd() - - /** {@inheritDoc} */ - @Postsubmit - @Test - override fun taskBarLayerIsVisibleAtStartAndEnd() = super.taskBarLayerIsVisibleAtStartAndEnd() - @Presubmit @Test fun imeWindowBecomesVisible() = flicker.imeWindowBecomesVisible() @Presubmit @Test fun imeLayerBecomesVisible() = flicker.imeLayerBecomesVisible() - @Postsubmit + @FlakyTest(bugId = 240918620) @Test fun snapshotStartingWindowLayerCoversExactlyOnApp() { Assume.assumeFalse(isShellTransitionsEnabled) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/SwitchImeWindowsFromGestureNavTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/SwitchImeWindowsFromGestureNavTest.kt index a6bbf54896630..477ddb3f82c15 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/SwitchImeWindowsFromGestureNavTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/SwitchImeWindowsFromGestureNavTest.kt @@ -17,7 +17,6 @@ package com.android.server.wm.flicker.ime import android.platform.test.annotations.FlakyTest -import android.platform.test.annotations.Postsubmit import android.platform.test.annotations.Presubmit import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.BaseTest @@ -92,52 +91,10 @@ open class SwitchImeWindowsFromGestureNavTest(flicker: FlickerTest) : BaseTest(f wmHelper.StateSyncBuilder().withFullScreenApp(imeTestApp).waitForAndVerify() } } - /** {@inheritDoc} */ - @Postsubmit + @FlakyTest(bugId = 265016201) @Test - override fun statusBarWindowIsAlwaysVisible() = super.statusBarWindowIsAlwaysVisible() - - /** {@inheritDoc} */ - @Postsubmit @Test override fun entireScreenCovered() = super.entireScreenCovered() - - /** {@inheritDoc} */ - @Postsubmit - @Test - override fun navBarLayerPositionAtStartAndEnd() = super.navBarLayerPositionAtStartAndEnd() - - /** {@inheritDoc} */ - @Postsubmit - @Test - override fun statusBarLayerIsVisibleAtStartAndEnd() = - super.statusBarLayerIsVisibleAtStartAndEnd() - - /** {@inheritDoc} */ - @Postsubmit - @Test - override fun navBarLayerIsVisibleAtStartAndEnd() = super.navBarLayerIsVisibleAtStartAndEnd() - - /** {@inheritDoc} */ - @Postsubmit - @Test - override fun taskBarLayerIsVisibleAtStartAndEnd() = super.taskBarLayerIsVisibleAtStartAndEnd() - - /** {@inheritDoc} */ - @Postsubmit - @Test - override fun statusBarLayerPositionAtStartAndEnd() = super.statusBarLayerPositionAtStartAndEnd() - - /** {@inheritDoc} */ - @Postsubmit - @Test - override fun visibleLayersShownMoreThanOneConsecutiveEntry() = - super.visibleLayersShownMoreThanOneConsecutiveEntry() - - /** {@inheritDoc} */ - @Postsubmit - @Test - override fun visibleWindowsShownMoreThanOneConsecutiveEntry() = - super.visibleWindowsShownMoreThanOneConsecutiveEntry() + override fun entireScreenCovered() = super.entireScreenCovered() @Presubmit @Test