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

Commit 933f257c authored by Nataniel Borges's avatar Nataniel Borges Committed by Android (Google) Code Review
Browse files

Merge "Improve IME test naming"

parents 1d7bfbd0 5cc9dc58

tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ImeAppAutoFocusHelper.kt→tests/FlickerTests/src/com/android/server/wm/flicker/helpers/ImeShownOnAppStartHelper.kt

+7 −4
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ import com.android.server.wm.traces.parser.toFlickerComponent 
import com.android.server.wm.traces.parser.windowmanager.WindowManagerStateHelper

import java.util.regex.Pattern



class ImeAppAutoFocusHelper

class ImeShownOnAppStartHelper

@JvmOverloads

constructor(

    instr: Instrumentation,
@@ -121,8 +121,11 @@ constructor( 
    }



    fun toggleFixPortraitOrientation(wmHelper: WindowManagerStateHelper) {

        val button = uiDevice.wait(Until.findObject(By.res(getPackage(),

                "toggle_fixed_portrait_btn")), FIND_TIMEOUT)

        val button =

            uiDevice.wait(

                Until.findObject(By.res(getPackage(), "toggle_fixed_portrait_btn")),

                FIND_TIMEOUT

            )

        require(button != null) {

            "Button not found, this usually happens when the device " +

                "was left in an unknown state (e.g. Screen turned off)"

tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeEditorPopupDialogTest.kt→tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeOnDismissPopupDialogTest.kt

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

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class CloseImeEditorPopupDialogTest(flicker: FlickerTest) : BaseTest(flicker) {

class CloseImeOnDismissPopupDialogTest(flicker: FlickerTest) : BaseTest(flicker) {

    private val imeTestApp = ImeEditorPopupDialogAppHelper(instrumentation)



    /** {@inheritDoc} */

tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToHomeTest.kt→tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeOnGoHomeTest.kt

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

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

open class CloseImeWindowToHomeTest(flicker: FlickerTest) : BaseTest(flicker) {

open class CloseImeOnGoHomeTest(flicker: FlickerTest) : BaseTest(flicker) {

    private val testApp = ImeAppHelper(instrumentation)



    /** {@inheritDoc} */

tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTestCfArm.kt→tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeOnGoHomeTestCfArm.kt

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

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

class OpenImeWindowTestCfArm(flicker: FlickerTest) : OpenImeWindowTest(flicker)
 
class CloseImeOnGoHomeTestCfArm(flicker: FlickerTest) : CloseImeOnGoHomeTest(flicker)

tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToHomeTest.kt→tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeShownOnAppStartOnGoHomeTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import com.android.server.wm.flicker.BaseTest 
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.ImeAppAutoFocusHelper

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

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

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

import com.android.server.wm.traces.common.service.PlatformConsts
@@ -48,8 +48,8 @@ import org.junit.runners.Parameterized 
@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

open class CloseImeAutoOpenWindowToHomeTest(flicker: FlickerTest) : BaseTest(flicker) {

    private val testApp = ImeAppAutoFocusHelper(instrumentation, flicker.scenario.startRotation)

open class CloseImeShownOnAppStartOnGoHomeTest(flicker: FlickerTest) : BaseTest(flicker) {

    private val testApp = ImeShownOnAppStartHelper(instrumentation, flicker.scenario.startRotation)



    /** {@inheritDoc} */

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