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

Commit cf2e7655 authored by Mateusz Cicheński's avatar Mateusz Cicheński Committed by Android (Google) Code Review
Browse files

Merge "Refactor the buildTransitions into overridable functions" into udc-dev

parents bbede1d8 277dcdaf

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

+17 −14
Original line number Original line Diff line number Diff line
@@ -16,7 +16,6 @@ 




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

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





import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.Presubmit

import android.tools.device.flicker.junit.FlickerParametersRunnerFactory

import android.tools.device.flicker.junit.FlickerParametersRunnerFactory

import android.tools.device.flicker.legacy.FlickerBuilder

import android.tools.device.flicker.legacy.FlickerBuilder
@@ -55,19 +54,23 @@ import org.junit.runners.Parameterized 
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class AutoEnterPipOnGoToHomeTest(flicker: FlickerTest) : EnterPipViaAppUiButtonTest(flicker) {

class AutoEnterPipOnGoToHomeTest(flicker: FlickerTest) : EnterPipViaAppUiButtonTest(flicker) {

    /** Defines the transition used to run the test */

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

    override val transition: FlickerBuilder.() -> Unit

        transitions { tapl.goHome() }

        get() = {

    }



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

        setup {

        setup {

            pipApp.launchViaIntent(wmHelper)

            pipApp.launchViaIntent(wmHelper)

            pipApp.enableAutoEnterForPipActivity()

            pipApp.enableAutoEnterForPipActivity()

        }

        }

    }



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

        teardown {

        teardown {

            // close gracefully so that onActivityUnpinned() can be called before force exit

            // close gracefully so that onActivityUnpinned() can be called before force exit

            pipApp.closePipWindow(wmHelper)

            pipApp.closePipWindow(wmHelper)

            pipApp.exit(wmHelper)

            pipApp.exit(wmHelper)

        }

        }

            transitions { tapl.goHome() }

    }

    }





    @Presubmit

    @Presubmit

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

+31 −33
Original line number Original line Diff line number Diff line
@@ -54,9 +54,7 @@ import org.junit.runners.Parameterized 
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

open class ClosePipBySwipingDownTest(flicker: FlickerTest) : ClosePipTransition(flicker) {

open class ClosePipBySwipingDownTest(flicker: FlickerTest) : ClosePipTransition(flicker) {

    override val transition: FlickerBuilder.() -> Unit

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

        get() = {

            super.transition(this)

        transitions {

        transitions {

            val pipRegion = wmHelper.getWindowRegion(pipApp).bounds

            val pipRegion = wmHelper.getWindowRegion(pipApp).bounds

            val pipCenterX = pipRegion.centerX()

            val pipCenterX = pipRegion.centerX()

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

+4 −5
Original line number Original line Diff line number Diff line
@@ -28,8 +28,7 @@ import org.junit.runners.Parameterized 




/** Base class for exiting pip (closing pip window) without returning to the app */

/** Base class for exiting pip (closing pip window) without returning to the app */

abstract class ClosePipTransition(flicker: FlickerTest) : PipTransition(flicker) {

abstract class ClosePipTransition(flicker: FlickerTest) : PipTransition(flicker) {

    override val transition: FlickerBuilder.() -> Unit

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

        get() = buildTransition {

        setup { this.setRotation(flicker.scenario.startRotation) }

        setup { this.setRotation(flicker.scenario.startRotation) }

        teardown { this.setRotation(Rotation.ROTATION_0) }

        teardown { this.setRotation(Rotation.ROTATION_0) }

    }

    }

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

+3 −6
Original line number Original line Diff line number Diff line
@@ -54,10 +54,7 @@ import org.junit.runners.Parameterized 
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

open class ClosePipWithDismissButtonTest(flicker: FlickerTest) : ClosePipTransition(flicker) {

open class ClosePipWithDismissButtonTest(flicker: FlickerTest) : ClosePipTransition(flicker) {



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

    override val transition: FlickerBuilder.() -> Unit

        get() = {

            super.transition(this)

        transitions { pipApp.closePipWindow(wmHelper) }

        transitions { pipApp.closePipWindow(wmHelper) }

    }

    }

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

+17 −13
Original line number Original line Diff line number Diff line
@@ -45,19 +45,23 @@ import org.junit.runners.Parameterized 
@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

open class EnterPipOnUserLeaveHintTest(flicker: FlickerTest) : EnterPipTransition(flicker) {

open class EnterPipOnUserLeaveHintTest(flicker: FlickerTest) : EnterPipTransition(flicker) {

    /** Defines the transition used to run the test */

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

    override val transition: FlickerBuilder.() -> Unit

        transitions { tapl.goHome() }

        get() = {

    }



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

        setup {

        setup {

            pipApp.launchViaIntent(wmHelper)

            pipApp.launchViaIntent(wmHelper)

            pipApp.enableEnterPipOnUserLeaveHint()

            pipApp.enableEnterPipOnUserLeaveHint()

        }

        }

    }



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

        teardown {

        teardown {

            // close gracefully so that onActivityUnpinned() can be called before force exit

            // close gracefully so that onActivityUnpinned() can be called before force exit

            pipApp.closePipWindow(wmHelper)

            pipApp.closePipWindow(wmHelper)

            pipApp.exit(wmHelper)

            pipApp.exit(wmHelper)

        }

        }

            transitions { tapl.goHome() }

    }

    }





    @Presubmit

    @Presubmit