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

Commit 94a16e37 authored by Nataniel Borges's avatar Nataniel Borges
Browse files

Remove deprecated AutomationUtils methods 

Those methods were replaced by WindowManagerStateHelper to make the tests more stable.

Bug: 172321238
Test: atest FlickerTests WMShellFlickerTests
Change-Id: I87d4fb031603eb060551f4800a31fb44851a3cff
parent 13e0d8cf

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/helpers/PipAppHelper.kt

+1 −2
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import android.os.SystemClock 
import androidx.test.uiautomator.By

import androidx.test.uiautomator.BySelector

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

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

import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper

import com.android.wm.shell.flicker.pip.tv.closeTvPipWindow

import com.android.wm.shell.flicker.pip.tv.isFocusedOrHasFocusedChild
@@ -113,7 +112,7 @@ class PipAppHelper(instrumentation: Instrumentation) : BaseAppHelper( 
        if (isTelevision) {

            uiDevice.closeTvPipWindow()

        } else {

            uiDevice.closePipWindow()

            closePipWindow(WindowManagerStateHelper(mInstrumentation))

        }

    }

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

+2 −5
Original line number Diff line number Diff line
@@ -16,13 +16,11 @@ 


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



import android.os.Bundle

import android.view.Surface

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.FlickerTestRunner

import com.android.server.wm.flicker.FlickerTestRunnerFactory

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
@@ -50,8 +48,7 @@ class EnterExitPipTest( 
        @JvmStatic

        fun getParams(): List<Array<Any>> {

            val testApp = FixedAppHelper(instrumentation)

            val baseConfig = getTransitionLaunch(eachRun = true)

            val testSpec: FlickerBuilder.(Bundle) -> Unit = { configuration ->

            val testSpec = getTransition(eachRun = true) { configuration ->

                setup {

                    eachRun {

                        testApp.launchViaIntent(wmHelper)
@@ -97,7 +94,7 @@ class EnterExitPipTest( 
                    }

                }

            }

            return FlickerTestRunnerFactory.getInstance().buildTest(instrumentation, baseConfig,

            return FlickerTestRunnerFactory.getInstance().buildTest(instrumentation,

                testSpec, supportedRotations = listOf(Surface.ROTATION_0),

                repetitions = 5)

        }

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

+3 −6
Original line number Diff line number Diff line
@@ -16,13 +16,11 @@ 


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



import android.os.Bundle

import android.view.Surface

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.FlickerTestRunner

import com.android.server.wm.flicker.FlickerTestRunnerFactory

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
@@ -50,9 +48,8 @@ class EnterPipTest( 
        @Parameterized.Parameters(name = "{0}")

        @JvmStatic

        fun getParams(): List<Array<Any>> {

            val baseConfig = getTransitionLaunch(

                eachRun = true, stringExtras = emptyMap())

            val testSpec: FlickerBuilder.(Bundle) -> Unit = { configuration ->

            val testSpec = getTransition(eachRun = true,

                stringExtras = emptyMap()) { configuration ->

                transitions {

                    pipApp.clickEnterPipButton()

                    pipApp.expandPipWindow(wmHelper)
@@ -92,7 +89,7 @@ class EnterPipTest( 
                }

            }



            return FlickerTestRunnerFactory.getInstance().buildTest(instrumentation, baseConfig,

            return FlickerTestRunnerFactory.getInstance().buildTest(instrumentation,

                testSpec, supportedRotations = listOf(Surface.ROTATION_0),

                repetitions = 5)

        }

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

+2 −5
Original line number Diff line number Diff line
@@ -16,13 +16,11 @@ 


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



import android.os.Bundle

import android.view.Surface

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.FlickerTestRunner

import com.android.server.wm.flicker.FlickerTestRunnerFactory

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

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

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

import com.android.server.wm.flicker.startRotation
@@ -48,8 +46,7 @@ class PipKeyboardTest(testSpec: FlickerTestRunnerFactory.TestSpec) : FlickerTest 
        @JvmStatic

        fun getParams(): Collection<Array<Any>> {

            val imeApp = ImeAppHelper(instrumentation)

            val baseConfig = getTransitionLaunch(eachRun = false)

            val testSpec: FlickerBuilder.(Bundle) -> Unit = { configuration ->

            val testSpec = getTransition(eachRun = false) { configuration ->

                setup {

                    test {

                        imeApp.launchViaIntent(wmHelper)
@@ -90,7 +87,7 @@ class PipKeyboardTest(testSpec: FlickerTestRunnerFactory.TestSpec) : FlickerTest 
            }



            return FlickerTestRunnerFactory.getInstance().buildTest(instrumentation,

                baseConfig, testSpec, supportedRotations = listOf(Surface.ROTATION_0),

                testSpec, supportedRotations = listOf(Surface.ROTATION_0),

                repetitions = 5)

        }

    }

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

+2 −6
Original line number Diff line number Diff line
@@ -16,13 +16,11 @@ 


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



import android.os.Bundle

import android.view.Surface

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.FlickerTestRunner

import com.android.server.wm.flicker.FlickerTestRunnerFactory

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

import com.android.server.wm.flicker.endRotation

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

import com.android.server.wm.flicker.helpers.setRotation
@@ -55,8 +53,7 @@ class PipRotationTest( 
        @JvmStatic

        fun getParams(): Collection<Array<Any>> {

            val fixedApp = FixedAppHelper(instrumentation)

            val baseConfig = getTransitionLaunch(eachRun = false)

            val testSpec: FlickerBuilder.(Bundle) -> Unit = { configuration ->

            val testSpec = getTransition(eachRun = false) { configuration ->

                setup {

                    test {

                        fixedApp.launchViaIntent(wmHelper)
@@ -112,8 +109,7 @@ class PipRotationTest( 
            }



            return FlickerTestRunnerFactory.getInstance().buildRotationTest(instrumentation,

                baseConfig, testSpec,

                supportedRotations = listOf(Surface.ROTATION_0, Surface.ROTATION_90),

                testSpec, supportedRotations = listOf(Surface.ROTATION_0, Surface.ROTATION_90),

                repetitions = 5)

        }

    }