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

Commit bb088a21 authored by Pablo Gamito's avatar Pablo Gamito
Browse files

Stabilize real apps pip tests 

Test: atest WMShellFlickerTestsPipAppsCSuite
Flag: TEST_ONLY
Bug: 377889094
Change-Id: Id6288a6db2e4d760c7687627835227e0aefa8e49
parent fd196378

libs/WindowManager/Shell/tests/flicker/pip/AndroidTestTemplate.xml

+8 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
        <!-- keeps the screen on during tests -->

        <option name="screen-always-on" value="on"/>

        <!-- Turns off Wi-fi -->

        <option name="wifi" value="off"/>

        <option name="wifi" value="on"/>

        <!-- Turns off Bluetooth -->

        <option name="bluetooth" value="off"/>

        <!-- prevents the phone from restarting -->
@@ -109,4 +109,11 @@ 
        <option name="collect-on-run-ended-only" value="true"/>

        <option name="clean-up" value="true"/>

    </metrics_collector>

    <!-- Enable mocking GPS location by the test app -->

    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">

        <option name="run-command"

            value="appops set com.android.shell android:mock_location allow"/>

        <option name="teardown-command"

            value="appops set com.android.shell android:mock_location deny"/>

    </target_preparer>

</configuration>

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

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import android.tools.flicker.legacy.LegacyFlickerTest 
import android.tools.flicker.subject.exceptions.ExceptionMessageBuilder

import android.tools.flicker.subject.exceptions.IncorrectRegionException

import android.tools.flicker.subject.layers.LayerSubject

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

import com.android.wm.shell.Flags

import com.android.wm.shell.flicker.pip.common.EnterPipTransition

import org.junit.Assume
@@ -65,6 +66,8 @@ import kotlin.math.abs 
@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@RequiresFlagsDisabled(Flags.FLAG_ENABLE_PIP2)

open class AutoEnterPipOnGoToHomeTest(flicker: LegacyFlickerTest) : EnterPipTransition(flicker) {

    override val pipApp: PipAppHelper = PipAppHelper(instrumentation)



    override val thisTransition: FlickerBuilder.() -> Unit = { transitions { tapl.goHome() } }



    override val defaultEnterPip: FlickerBuilder.() -> Unit = {

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

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import android.tools.flicker.junit.FlickerParametersRunnerFactory 
import android.tools.flicker.legacy.FlickerBuilder

import android.tools.flicker.legacy.LegacyFlickerTest

import android.tools.traces.component.ComponentNameMatcher

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

import com.android.wm.shell.Flags

import org.junit.FixMethodOrder

import org.junit.Test
@@ -57,6 +58,8 @@ import org.junit.runners.Parameterized 
@RequiresFlagsDisabled(Flags.FLAG_ENABLE_PIP2)

class AutoEnterPipWithSourceRectHintTest(flicker: LegacyFlickerTest) :

    AutoEnterPipOnGoToHomeTest(flicker) {

    override val pipApp: PipAppHelper = PipAppHelper(instrumentation)



    override val defaultEnterPip: FlickerBuilder.() -> Unit = {

        setup {

            pipApp.launchViaIntent(wmHelper)

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

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.platform.test.annotations.RequiresFlagsDisabled 
import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.flicker.legacy.FlickerBuilder

import android.tools.flicker.legacy.LegacyFlickerTest

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

import com.android.wm.shell.Flags

import com.android.wm.shell.flicker.pip.common.ClosePipTransition

import org.junit.FixMethodOrder
@@ -56,6 +57,8 @@ import org.junit.runners.Parameterized 
@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@RequiresFlagsDisabled(Flags.FLAG_ENABLE_PIP2)

class ClosePipWithDismissButtonTest(flicker: LegacyFlickerTest) : ClosePipTransition(flicker) {

    override val pipApp: PipAppHelper = PipAppHelper(instrumentation)



    override val thisTransition: FlickerBuilder.() -> Unit = {

        transitions { pipApp.closePipWindow(wmHelper) }

    }

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

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.platform.test.annotations.RequiresFlagsDisabled 
import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.flicker.legacy.FlickerBuilder

import android.tools.flicker.legacy.LegacyFlickerTest

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

import com.android.wm.shell.Flags

import com.android.wm.shell.flicker.pip.common.EnterPipTransition

import org.junit.Assume
@@ -47,6 +48,7 @@ import org.junit.runners.Parameterized 
@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@RequiresFlagsDisabled(Flags.FLAG_ENABLE_PIP2)

class EnterPipOnUserLeaveHintTest(flicker: LegacyFlickerTest) : EnterPipTransition(flicker) {

    override val pipApp: PipAppHelper = PipAppHelper(instrumentation)

    override val thisTransition: FlickerBuilder.() -> Unit = { transitions { tapl.goHome() } }



    override val defaultEnterPip: FlickerBuilder.() -> Unit = {