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

Commit 61a60c15 authored by Pablo Gamito's avatar Pablo Gamito Committed by Android (Google) Code Review
Browse files

Merge "Promote stable Flicker tests"

parents 0f4d28bf 1a86eef7

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

+0 −10
Original line number Diff line number Diff line
@@ -16,14 +16,12 @@ 


package com.android.wm.shell.flicker.pip



import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.RequiresDevice

import com.android.server.wm.flicker.FlickerParametersRunnerFactory

import com.android.server.wm.flicker.FlickerTestParameter

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

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

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

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

import com.android.server.wm.flicker.rules.RemoveAllTasksButHomeRule
@@ -108,14 +106,6 @@ class EnterPipOnUserLeaveHintTest(testSpec: FlickerTestParameter) : EnterPipTest 
    @Presubmit

    @Test

    override fun entireScreenCovered() {

        Assume.assumeFalse(isShellTransitionsEnabled)

        super.entireScreenCovered()

    }



    @FlakyTest(bugId = 227313015)

    @Test

    fun entireScreenCovered_ShellTransit() {

        Assume.assumeTrue(isShellTransitionsEnabled)

        super.entireScreenCovered()

    }

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

+5 −4
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


package com.android.wm.shell.flicker.pip



import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.RequiresDevice
@@ -83,8 +82,10 @@ open class EnterPipTest(testSpec: FlickerTestParameter) : PipTransition(testSpec 
        testSpec.assertWm { this.isAppWindowVisible(pipApp) }

    }



    /** Checks [pipApp] layer remains visible throughout the animation */

    @FlakyTest(bugId = 239807171)

    /**

     * Checks [pipApp] layer remains visible throughout the animation

     */

    @Presubmit

    @Test

    open fun pipAppLayerAlwaysVisible() {

        testSpec.assertLayers { this.isVisible(pipApp) }
@@ -104,7 +105,7 @@ open class EnterPipTest(testSpec: FlickerTestParameter) : PipTransition(testSpec 
     * Checks that the pip app layer remains inside the display bounds throughout the whole

     * animation

     */

    @FlakyTest(bugId = 239807171)

    @Presubmit

    @Test

    open fun pipLayerRemainInsideVisibleBounds() {

        testSpec.assertLayersVisibleRegion(pipApp) { coversAtMost(displayBounds) }

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

+1 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.wm.shell.flicker.pip 


import android.app.Activity

import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.RequiresDevice
@@ -225,7 +224,7 @@ class EnterPipToOtherOrientationTest( 
    }



    /** {@inheritDoc}  */

    @Postsubmit

    @Presubmit

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()

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

+3 −3
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.wm.shell.flicker.pip



import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.RequiresDevice

import com.android.server.wm.flicker.FlickerParametersRunnerFactory
@@ -76,12 +76,12 @@ class ExitPipViaExpandButtonClickTest( 
        }



    /** {@inheritDoc}  */

    @FlakyTest(bugId = 227313015)

    @Presubmit

    @Test

    override fun entireScreenCovered() = super.entireScreenCovered()



    /** {@inheritDoc}  */

    @FlakyTest(bugId = 197726610)

    @Presubmit

    @Test

    override fun pipLayerExpands() = super.pipLayerExpands()

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

+4 −2
Original line number Diff line number Diff line
@@ -75,7 +75,9 @@ class ExitPipViaIntentTest(testSpec: FlickerTestParameter) : ExitPipToAppTransit 
        }



    /** {@inheritDoc}  */

    @FlakyTest @Test override fun entireScreenCovered() = super.entireScreenCovered()

    @Presubmit

    @Test

    override fun entireScreenCovered() = super.entireScreenCovered()



    /** {@inheritDoc} */

    @Presubmit