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

Commit 9606e48d authored by Nataniel Borges's avatar Nataniel Borges Committed by Automerger Merge Worker
Browse files

Merge "Promote stable PIP app tests to presubmit" into sc-dev am: a4c58706

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

Change-Id: I172e27f441ccfaf85ce34baf19b2194db881dae7
parents 1899102e a4c58706
Loading
Loading
Loading
Loading
+1 −19
Original line number Diff line number Diff line
@@ -16,10 +16,8 @@

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

import android.platform.test.annotations.Postsubmit
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
@@ -64,7 +62,7 @@ class EnterPipTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) {
        }
    }

    @Postsubmit
    @Presubmit
    @Test
    fun pipWindowBecomesVisible() {
        testSpec.assertWm {
@@ -74,22 +72,6 @@ class EnterPipTest(testSpec: FlickerTestParameter) : PipTransition(testSpec) {
        }
    }

    @FlakyTest(bugId = 140855415)
    @Test
    override fun navBarLayerIsAlwaysVisible() = super.navBarLayerIsAlwaysVisible()

    @FlakyTest(bugId = 140855415)
    @Test
    override fun navBarLayerRotatesAndScales() = super.navBarLayerRotatesAndScales()

    @FlakyTest(bugId = 140855415)
    @Test
    override fun statusBarLayerRotatesScales() = super.statusBarLayerRotatesScales()

    @FlakyTest(bugId = 140855415)
    @Test
    override fun noUncoveredRegions() = super.noUncoveredRegions()

    companion object {
        @Parameterized.Parameters(name = "{0}")
        @JvmStatic
+4 −12
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@

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

import android.platform.test.annotations.Postsubmit
import android.platform.test.annotations.Presubmit
import android.view.Surface
import androidx.test.filters.RequiresDevice
import com.android.launcher3.tapl.LauncherInstrumentation
@@ -55,19 +55,11 @@ class PipMovesInAllApps(testSpec: FlickerTestParameter) : PipTransition(testSpec
            }
        }

    @Postsubmit
    @Test
    override fun statusBarWindowIsAlwaysVisible() = super.statusBarWindowIsAlwaysVisible()

    @Postsubmit
    @Test
    override fun navBarWindowIsAlwaysVisible() = super.navBarWindowIsAlwaysVisible()

    @Postsubmit
    @Presubmit
    @Test
    fun pipAlwaysVisible() = testSpec.assertWm { this.showsAppWindow(pipApp.windowName) }

    @Postsubmit
    @Presubmit
    @Test
    fun pipLayerInsideDisplay() {
        testSpec.assertLayersStart {
@@ -75,7 +67,7 @@ class PipMovesInAllApps(testSpec: FlickerTestParameter) : PipTransition(testSpec
        }
    }

    @Postsubmit
    @Presubmit
    @Test
    fun pipWindowMovesUp() = testSpec.assertWmEnd {
        val initialState = this.trace?.first()?.wmState
+4 −5
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 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
@@ -76,19 +75,19 @@ class PipRotationTest(testSpec: FlickerTestParameter) : PipTransition(testSpec)
    override fun noUncoveredRegions() = testSpec.noUncoveredRegions(testSpec.config.startRotation,
        testSpec.config.endRotation, allStates = false)

    @FlakyTest(bugId = 140855415)
    @Presubmit
    @Test
    override fun navBarLayerRotatesAndScales() =
        testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation,
            testSpec.config.endRotation)

    @FlakyTest(bugId = 140855415)
    @Presubmit
    @Test
    override fun statusBarLayerRotatesScales() =
        testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation,
            testSpec.config.endRotation)

    @FlakyTest(bugId = 140855415)
    @Presubmit
    @Test
    fun appLayerRotates_StartingBounds() {
        testSpec.assertLayersStart {
@@ -97,7 +96,7 @@ class PipRotationTest(testSpec: FlickerTestParameter) : PipTransition(testSpec)
        }
    }

    @FlakyTest(bugId = 140855415)
    @Presubmit
    @Test
    fun appLayerRotates_EndingBounds() {
        testSpec.assertLayersEnd {
+1 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@

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

import android.platform.test.annotations.Postsubmit
import android.platform.test.annotations.Presubmit
import android.view.Surface
import androidx.test.filters.FlakyTest
@@ -112,7 +111,7 @@ class SetRequestedOrientationWhilePinnedTest(
        }
    }

    @Postsubmit
    @Presubmit
    @Test
    fun pipAlwaysVisible() = testSpec.assertWm {
        this.showsAppWindow(pipApp.windowName)