Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc1fe9dd authored by Mateusz Cicheński's avatar Mateusz Cicheński Committed by Automerger Merge Worker
Browse files

Merge "Remove the FlakyTest annotation from no-longer flaky test." into... 

Merge "Remove the FlakyTest annotation from no-longer flaky test." into tm-qpr-dev am: 6e5aa44a am: cb7370b1

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19099241



Change-Id: Ieb137a0d8121a6ffdcdde51a950f952ecaded63e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents dad6597b cb7370b1

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipTest.kt

+0 −5
Original line number Diff line number Diff line
@@ -77,11 +77,6 @@ open class EnterPipTest(testSpec: FlickerTestParameter) : PipTransition(testSpec 
            }

        }



    /** {@inheritDoc}  */

    @FlakyTest(bugId = 206753786)

    @Test

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()



    /**

     * Checks [pipApp] window remains visible throughout the animation

     */

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/EnterPipToOtherOrientationTest.kt

+0 −9
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import com.android.server.wm.flicker.dsl.FlickerBuilder 
import com.android.server.wm.flicker.entireScreenCovered

import com.android.server.wm.flicker.helpers.WindowUtils

import com.android.server.wm.flicker.navBarLayerRotatesAndScales

import com.android.server.wm.flicker.statusBarLayerRotatesScales

import com.android.server.wm.traces.common.FlickerComponentName

import com.android.wm.shell.flicker.helpers.FixedAppHelper

import com.android.wm.shell.flicker.pip.PipTransition.BroadcastActionTrigger.Companion.ORIENTATION_LANDSCAPE
@@ -115,14 +114,6 @@ class EnterPipToOtherOrientationTest( 
    @Test

    override fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales()



    /**

     * Checks that the [FlickerComponentName.STATUS_BAR] has the correct position at

     * the start and end of the transition

     */

    @FlakyTest(bugId = 206753786)

    @Test

    override fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()



    /**

     * Checks that all parts of the screen are covered at the start and end of the transition

     *

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipViaExpandButtonClickTest.kt

+0 −5
Original line number Diff line number Diff line
@@ -80,11 +80,6 @@ class ExitPipViaExpandButtonClickTest( 
            }

        }



    /** {@inheritDoc}  */

    @FlakyTest(bugId = 206753786)

    @Test

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()



    /** {@inheritDoc}  */

    @FlakyTest(bugId = 197726610)

    @Test

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipWithSwipeDownTest.kt

+0 −5
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import com.android.server.wm.flicker.FlickerTestParameter 
import com.android.server.wm.flicker.FlickerTestParameterFactory

import com.android.server.wm.flicker.annotation.Group3

import com.android.server.wm.flicker.dsl.FlickerBuilder

import com.android.server.wm.flicker.statusBarLayerRotatesScales

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -81,10 +80,6 @@ class ExitPipWithSwipeDownTest(testSpec: FlickerTestParameter) : ExitPipTransiti 
    @Test

    override fun pipLayerBecomesInvisible() = super.pipLayerBecomesInvisible()



    @FlakyTest(bugId = 206753786)

    @Test

    override fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()



    /**

     * Checks that the focus doesn't change between windows during the transition

     */

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/PipRotationTest.kt

+0 −8
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import com.android.server.wm.flicker.entireScreenCovered 
import com.android.server.wm.flicker.helpers.WindowUtils

import com.android.server.wm.flicker.helpers.setRotation

import com.android.server.wm.flicker.navBarLayerRotatesAndScales

import com.android.server.wm.flicker.statusBarLayerRotatesScales

import com.android.wm.shell.flicker.helpers.FixedAppHelper

import org.junit.FixMethodOrder

import org.junit.Test
@@ -95,13 +94,6 @@ open class PipRotationTest(testSpec: FlickerTestParameter) : PipTransition(testS 
    @Test

    override fun navBarLayerRotatesAndScales() = testSpec.navBarLayerRotatesAndScales()



    /**

     * Checks the position of the status bar at the start and end of the transition

     */

    @FlakyTest(bugId = 206753786)

    @Test

    override fun statusBarLayerRotatesScales() = testSpec.statusBarLayerRotatesScales()



    /**

     * Checks that [fixedApp] layer is within [screenBoundsStart] at the start of the transition

     */