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

Commit 3b78ba36 authored by Pablo Gamito's avatar Pablo Gamito Committed by Automerger Merge Worker
Browse files

Merge "Promote and demote flicker tests" into tm-dev am: e1dbfe84 am: 9d3ac7fd 

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



Change-Id: Ibb04844b4c0c6ab52964cee4d0717df8a6b99eea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 12037cd4 9d3ac7fd

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

+2 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


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



import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice
@@ -84,7 +85,7 @@ class ExitPipViaIntentTest(testSpec: FlickerTestParameter) : ExitPipToAppTransit 
    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()



    /** {@inheritDoc}  */

    @FlakyTest(bugId = 197726610)

    @Presubmit

    @Test

    override fun pipLayerExpands() = super.pipLayerExpands()

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

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ class ExpandPipOnDoubleClickTest(testSpec: FlickerTestParameter) : PipTransition 
    /**

     * Checks that the visible region of [pipApp] always expands during the animation

     */

    @Presubmit

    @FlakyTest(bugId = 228012337)

    @Test

    fun pipLayerExpands() {

        val layerName = pipApp.component.toLayerName()

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

+18 −9
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 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.Assume

import org.junit.Before

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -69,11 +68,6 @@ open class PipRotationTest(testSpec: FlickerTestParameter) : PipTransition(testS 
    private val screenBoundsStart = WindowUtils.getDisplayBounds(testSpec.startRotation)

    private val screenBoundsEnd = WindowUtils.getDisplayBounds(testSpec.endRotation)



    @Before

    open fun before() {

        Assume.assumeFalse(isShellTransitionsEnabled)

    }



    override val transition: FlickerBuilder.() -> Unit

        get() = buildTransition(eachRun = false) {

            setup {
@@ -135,14 +129,29 @@ open class PipRotationTest(testSpec: FlickerTestParameter) : PipTransition(testS 
    /**

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

     */

    @Presubmit

    @Test

    open fun pipLayerRotates_StartingBounds() {

    private fun pipLayerRotates_StartingBounds_internal() {

        testSpec.assertLayersStart {

            visibleRegion(pipApp.component).coversAtMost(screenBoundsStart)

        }

    }



    /**

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

     */

    @Presubmit

    @Test

    fun pipLayerRotates_StartingBounds() {

        Assume.assumeFalse(isShellTransitionsEnabled)

        pipLayerRotates_StartingBounds_internal()

    }



    @FlakyTest(bugId = 228024285)

    @Test

    fun pipLayerRotates_StartingBounds_ShellTransit() {

        Assume.assumeTrue(isShellTransitionsEnabled)

        pipLayerRotates_StartingBounds_internal()

    }



    /**

     * Checks that [pipApp] layer is within [screenBoundsEnd] at the end of the transition

     */

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

+0 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ import org.junit.runners.Parameterized 
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@Group4

@FlakyTest(bugId = 218604389)

open class SetRequestedOrientationWhilePinnedTest(

    testSpec: FlickerTestParameter

) : PipTransition(testSpec) {

tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowToOverViewTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -114,7 +114,7 @@ class OpenImeWindowToOverViewTest(private val testSpec: FlickerTestParameter) { 
        }

    }



    @Presubmit

    @FlakyTest(bugId = 228011606)

    @Test

    fun imeLayerIsVisibleAndAssociatedWithAppWidow() {

        testSpec.assertLayersStart {