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

Commit 575f4bf3 authored by Nataniel Borges's avatar Nataniel Borges Committed by Android (Google) Code Review
Browse files

Merge "Generalize pip transitions and assertions" into sc-dev

parents 67fca0b5 41b7c172

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

+0 −23
Original line number Diff line number Diff line
@@ -23,13 +23,7 @@ import com.android.server.wm.flicker.FlickerParametersRunnerFactory 
import com.android.server.wm.flicker.FlickerTestParameter

import com.android.server.wm.flicker.FlickerTestParameterFactory

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

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

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

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.startRotation

import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -48,7 +42,6 @@ class EnterExitPipTest( 
    testSpec: FlickerTestParameter

) : PipTransition(testSpec) {

    private val testApp = FixedAppHelper(instrumentation)

    private val displayBounds = WindowUtils.getDisplayBounds(testSpec.config.startRotation)



    override val transition: FlickerBuilder.(Map<String, Any?>) -> Unit

        get() = buildTransition(eachRun = true) {
@@ -82,14 +75,6 @@ class EnterExitPipTest( 
        }

    }



    @Presubmit

    @Test

    fun navBarWindowIsAlwaysVisible() = testSpec.navBarWindowIsAlwaysVisible()



    @Presubmit

    @Test

    fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()



    @Presubmit

    @Test

    fun showBothAppLayersThenHidePip() {
@@ -118,14 +103,6 @@ class EnterExitPipTest( 
        }

    }



    @Presubmit

    @Test

    fun navBarLayerIsAlwaysVisible() = testSpec.navBarLayerIsAlwaysVisible()



    @Presubmit

    @Test

    fun statusBarLayerIsAlwaysVisible() = testSpec.statusBarLayerIsAlwaysVisible()



    companion object {

        @Parameterized.Parameters(name = "{0}")

        @JvmStatic

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

+7 −30
Original line number Diff line number Diff line
@@ -24,14 +24,6 @@ import com.android.server.wm.flicker.FlickerParametersRunnerFactory 
import com.android.server.wm.flicker.FlickerTestParameter

import com.android.server.wm.flicker.FlickerTestParameterFactory

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

import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible

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

import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible

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

import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.noUncoveredRegions

import com.android.server.wm.flicker.startRotation

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -55,14 +47,6 @@ class EnterPipTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) { 
            }

        }



    @Presubmit

    @Test

    fun navBarWindowIsAlwaysVisible() = testSpec.navBarWindowIsAlwaysVisible()



    @Presubmit

    @Test

    fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()



    @Presubmit

    @Test

    fun pipWindowBecomesVisible() {
@@ -71,15 +55,6 @@ class EnterPipTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) { 
        }

    }



    @Presubmit

    @Test

    fun statusBarLayerIsAlwaysVisible() = testSpec.statusBarLayerIsAlwaysVisible()



    @Presubmit

    @Test

    fun statusBarLayerRotatesScales() =

        testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation, Surface.ROTATION_0)



    @Presubmit

    @Test

    fun pipLayerBecomesVisible() {
@@ -90,17 +65,19 @@ class EnterPipTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) { 


    @FlakyTest(bugId = 140855415)

    @Test

    fun navBarLayerIsAlwaysVisible() = testSpec.navBarLayerIsAlwaysVisible()

    override fun navBarLayerIsAlwaysVisible() = super.navBarLayerIsAlwaysVisible()



    @FlakyTest(bugId = 140855415)

    @Test

    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()



    @FlakyTest(bugId = 140855415)

    @Test

    fun navBarLayerRotatesAndScales() =

        testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation, Surface.ROTATION_0)

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()



    @FlakyTest(bugId = 140855415)

    @Test

    fun noUncoveredRegions() =

        testSpec.noUncoveredRegions(testSpec.config.startRotation, Surface.ROTATION_0)

    override fun noUncoveredRegions() = super.noUncoveredRegions()



    companion object {

        @Parameterized.Parameters(name = "{0}")

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

+9 −20
Original line number Diff line number Diff line
@@ -18,16 +18,13 @@ 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

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

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

import com.android.server.wm.flicker.FlickerTestParameterFactory

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

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

import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible

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

import com.android.wm.shell.flicker.pip.PipTransition.BroadcastActionTrigger.Companion.ORIENTATION_LANDSCAPE

import com.android.wm.shell.flicker.pip.PipTransition.BroadcastActionTrigger.Companion.ORIENTATION_PORTRAIT
@@ -83,6 +80,14 @@ class EnterPipToOtherOrientationTest( 
            }

        }



    @FlakyTest

    @Test

    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()



    @FlakyTest

    @Test

    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()



    @Presubmit

    @Test

    fun pipAppWindowIsAlwaysOnTop() {
@@ -107,14 +112,6 @@ class EnterPipToOtherOrientationTest( 
        }

    }



    @Presubmit

    @Test

    fun navBarWindowIsAlwaysVisible() = testSpec.navBarWindowIsAlwaysVisible()



    @Presubmit

    @Test

    fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()



    @Presubmit

    @Test

    fun pipAppLayerHidesTestApp() {
@@ -132,14 +129,6 @@ class EnterPipToOtherOrientationTest( 
        }

    }



    @Presubmit

    @Test

    fun navBarLayerIsAlwaysVisible() = testSpec.navBarLayerIsAlwaysVisible()



    @Presubmit

    @Test

    fun statusBarLayerIsAlwaysVisible() = testSpec.statusBarLayerIsAlwaysVisible()



    companion object {

        @Parameterized.Parameters(name = "{0}")

        @JvmStatic

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

+0 −38
Original line number Diff line number Diff line
@@ -24,14 +24,7 @@ import com.android.server.wm.flicker.FlickerTestParameterFactory 
import com.android.server.wm.flicker.dsl.FlickerBuilder

import com.android.server.wm.flicker.focusChanges

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

import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible

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

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.noUncoveredRegions

import com.android.server.wm.flicker.startRotation

import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible

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

import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible

import org.junit.Test

import org.junit.runners.Parameterized
@@ -50,22 +43,6 @@ abstract class PipCloseTransition(testSpec: FlickerTestParameter) : PipTransitio 
            }

        }



    @Presubmit

    @Test

    open fun navBarLayerIsAlwaysVisible() = testSpec.navBarLayerIsAlwaysVisible()



    @Presubmit

    @Test

    open fun statusBarLayerIsAlwaysVisible() = testSpec.statusBarLayerIsAlwaysVisible()



    @Presubmit

    @Test

    open fun navBarWindowIsAlwaysVisible() = testSpec.navBarWindowIsAlwaysVisible()



    @Presubmit

    @Test

    open fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()



    @Presubmit

    @Test

    open fun pipWindowBecomesInvisible() {
@@ -86,21 +63,6 @@ abstract class PipCloseTransition(testSpec: FlickerTestParameter) : PipTransitio 
        }

    }



    @Presubmit

    @Test

    open fun statusBarLayerRotatesScales() =

        testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation, Surface.ROTATION_0)



    @Presubmit

    @Test

    open fun noUncoveredRegions() =

        testSpec.noUncoveredRegions(testSpec.config.startRotation, Surface.ROTATION_0)



    @Presubmit

    @Test

    open fun navBarLayerRotatesAndScales() =

        testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation, Surface.ROTATION_0)



    @FlakyTest(bugId = 151179149)

    @Test

    open fun focusChanges() = testSpec.focusChanges(pipApp.launcherName, "NexusLauncherActivity")

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

+4 −11
Original line number Diff line number Diff line
@@ -24,17 +24,11 @@ import com.android.server.wm.flicker.FlickerParametersRunnerFactory 
import com.android.server.wm.flicker.FlickerTestParameter

import com.android.server.wm.flicker.FlickerTestParameterFactory

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

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

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

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

import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible

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

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

import com.android.server.wm.flicker.repetitions

import com.android.server.wm.flicker.startRotation

import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible

import com.android.wm.shell.flicker.removeAllTasksButHome

import com.android.wm.shell.flicker.testapp.Components.PipActivity.EXTRA_ENTER_PIP

import org.junit.FixMethodOrder
@@ -55,7 +49,6 @@ import org.junit.runners.Parameterized 
class PipLegacySplitScreenTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) {

    private val imeApp = ImeAppHelper(instrumentation)

    private val testApp = FixedAppHelper(instrumentation)

    private val displayBounds = WindowUtils.getDisplayBounds(testSpec.config.startRotation)



    override val transition: FlickerBuilder.(Map<String, Any?>) -> Unit

        get() = {
@@ -105,11 +98,11 @@ class PipLegacySplitScreenTest(testSpec: FlickerTestParameter) : PipTransition(t 


    @Postsubmit

    @Test

    fun navBarWindowIsAlwaysVisible() = testSpec.navBarWindowIsAlwaysVisible()

    override fun navBarWindowIsAlwaysVisible() = super.navBarWindowIsAlwaysVisible()



    @Postsubmit

    @Test

    fun statusBarWindowIsAlwaysVisible() = testSpec.statusBarWindowIsAlwaysVisible()

    override fun statusBarWindowIsAlwaysVisible() = super.statusBarWindowIsAlwaysVisible()



    @Postsubmit

    @Test
@@ -130,11 +123,11 @@ class PipLegacySplitScreenTest(testSpec: FlickerTestParameter) : PipTransition(t 


    @Postsubmit

    @Test

    fun navBarLayerIsAlwaysVisible() = testSpec.navBarLayerIsAlwaysVisible()

    override fun navBarLayerIsAlwaysVisible() = super.navBarLayerIsAlwaysVisible()



    @Postsubmit

    @Test

    fun statusBarLayerIsAlwaysVisible() = testSpec.statusBarLayerIsAlwaysVisible()

    override fun statusBarLayerIsAlwaysVisible() = super.statusBarLayerIsAlwaysVisible()



    companion object {

        const val TEST_REPETITIONS = 2