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

Commit f0cd4e9e authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Improve pip test naming 

Previous names didn't clearly identify the test behavior

Test: atest FlickerTests
Bug: 265910451
Change-Id: I6f1e05e9f4faa57234fb4a6c8263f7f314863f90
parent aabd1baa

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

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

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@FlakyTest(bugId = 238367575)

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

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

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

    override val transition: FlickerBuilder.() -> Unit

        get() = {

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

+1 −19
Original line number Diff line number Diff line
@@ -20,10 +20,8 @@ import android.platform.test.annotations.Presubmit 
import androidx.test.filters.RequiresDevice

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

import com.android.server.wm.flicker.FlickerTest

import com.android.server.wm.flicker.FlickerTestFactory

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

import com.android.server.wm.traces.common.component.matchers.ComponentNameMatcher

import com.android.server.wm.traces.common.service.PlatformConsts

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -54,7 +52,7 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

open class ExitPipWithSwipeDownTest(flicker: FlickerTest) : ExitPipTransition(flicker) {

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

    override val transition: FlickerBuilder.() -> Unit

        get() = {

            super.transition(this)
@@ -96,20 +94,4 @@ open class ExitPipWithSwipeDownTest(flicker: FlickerTest) : ExitPipTransition(fl 
    fun focusDoesNotChange() {

        flicker.assertEventLog { this.focusDoesNotChange() }

    }



    companion object {

        /**

         * Creates the test configurations.

         *

         * See [FlickerTestFactory.nonRotationTests] for configuring repetitions, screen orientation

         * and navigation modes.

         */

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

        @JvmStatic

        fun getParams(): List<FlickerTest> {

            return FlickerTestFactory.nonRotationTests(

                supportedRotations = listOf(PlatformConsts.Rotation.ROTATION_0)

            )

        }

    }

}

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ExitPipWithSwipeDownTestCfArm.kt→libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/ClosePipBySwipingDownTestCfArm.kt

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class ExitPipWithSwipeDownTestCfArm(flicker: FlickerTest) : ExitPipWithSwipeDownTest(flicker) {

class ClosePipBySwipingDownTestCfArm(flicker: FlickerTest) : ClosePipBySwipingDownTest(flicker) {

    companion object {

        /**

         * Creates the test configurations.

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

+19 −1
Original line number Diff line number Diff line
@@ -19,14 +19,16 @@ package com.android.wm.shell.flicker.pip 
import android.platform.test.annotations.Presubmit

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

import com.android.server.wm.flicker.FlickerTest

import com.android.server.wm.flicker.FlickerTestFactory

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

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

import com.android.server.wm.traces.common.component.matchers.ComponentNameMatcher.Companion.LAUNCHER

import com.android.server.wm.traces.common.service.PlatformConsts

import org.junit.Test

import org.junit.runners.Parameterized



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

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

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

    override val transition: FlickerBuilder.() -> Unit

        get() = buildTransition {

            setup { this.setRotation(flicker.scenario.startRotation) }
@@ -77,4 +79,20 @@ abstract class ExitPipTransition(flicker: FlickerTest) : PipTransition(flicker) 
                .isVisible(LAUNCHER)

        }

    }



    companion object {

        /**

         * Creates the test configurations.

         *

         * See [FlickerTestFactory.nonRotationTests] for configuring repetitions, screen orientation

         * and navigation modes.

         */

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

        @JvmStatic

        fun getParams(): List<FlickerTest> {

            return FlickerTestFactory.nonRotationTests(

                supportedRotations = listOf(PlatformConsts.Rotation.ROTATION_0)

            )

        }

    }

}

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

+1 −19
Original line number Diff line number Diff line
@@ -20,9 +20,7 @@ import android.platform.test.annotations.Presubmit 
import androidx.test.filters.RequiresDevice

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

import com.android.server.wm.flicker.FlickerTest

import com.android.server.wm.flicker.FlickerTestFactory

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

import com.android.server.wm.traces.common.service.PlatformConsts

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.runner.RunWith
@@ -54,7 +52,7 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

open class ExitPipWithDismissButtonTest(flicker: FlickerTest) : ExitPipTransition(flicker) {

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



    override val transition: FlickerBuilder.() -> Unit

        get() = {
@@ -71,20 +69,4 @@ open class ExitPipWithDismissButtonTest(flicker: FlickerTest) : ExitPipTransitio 
    fun focusChanges() {

        flicker.assertEventLog { this.focusChanges("PipMenuView", "NexusLauncherActivity") }

    }



    companion object {

        /**

         * Creates the test configurations.

         *

         * See [FlickerTestFactory.nonRotationTests] for configuring repetitions, screen orientation

         * and navigation modes.

         */

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

        @JvmStatic

        fun getParams(): List<FlickerTest> {

            return FlickerTestFactory.nonRotationTests(

                supportedRotations = listOf(PlatformConsts.Rotation.ROTATION_0)

            )

        }

    }

}