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

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

Merge "3-button mode tests for IME tests" into sc-dev

parents 4a1f7990 aa48f0ed

tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeAutoOpenWindowToAppTest.kt

+2 −20
Original line number Original line Diff line number Diff line
@@ -19,8 +19,6 @@ package com.android.server.wm.flicker.ime 
import android.app.Instrumentation

import android.app.Instrumentation

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Postsubmit

import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.Presubmit

import android.view.Surface

import android.view.WindowManagerPolicyConstants

import androidx.test.filters.FlakyTest

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.platform.app.InstrumentationRegistry
@@ -30,13 +28,10 @@ import com.android.server.wm.flicker.FlickerTestParameter 
import com.android.server.wm.flicker.FlickerTestParameterFactory

import com.android.server.wm.flicker.FlickerTestParameterFactory

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

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

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

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

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

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

import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.navBarLayerRotatesAndScales

import com.android.server.wm.flicker.navBarLayerRotatesAndScales

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.noUncoveredRegions

import com.android.server.wm.flicker.noUncoveredRegions

import com.android.server.wm.flicker.repetitions

import com.android.server.wm.flicker.startRotation

import com.android.server.wm.flicker.startRotation

import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.statusBarLayerRotatesScales

import com.android.server.wm.flicker.statusBarLayerRotatesScales
@@ -64,23 +59,15 @@ class CloseImeAutoOpenWindowToAppTest(private val testSpec: FlickerTestParameter 
    @FlickerBuilderProvider

    @FlickerBuilderProvider

    fun buildFlicker(): FlickerBuilder {

    fun buildFlicker(): FlickerBuilder {

        return FlickerBuilder(instrumentation).apply {

        return FlickerBuilder(instrumentation).apply {

            withTestName { testSpec.name }

            repeat { testSpec.config.repetitions }

            setup {

            setup {

                test {

                    device.wakeUpAndGoToHomeScreen()

                }

                eachRun {

                eachRun {

                    testApp.launchViaIntent(wmHelper)

                    testApp.launchViaIntent(wmHelper)

                    testApp.openIME(device, wmHelper)

                    testApp.openIME(device, wmHelper)

                    this.setRotation(testSpec.config.startRotation)

                }

                }

            }

            }

            teardown {

            teardown {

                test {

                test {

                    testApp.exit()

                    testApp.exit(wmHelper)

                    wmHelper.waitForAppTransitionIdle()

                    this.setRotation(Surface.ROTATION_0)

                }

                }

            }

            }

            transitions {

            transitions {
@@ -172,12 +159,7 @@ class CloseImeAutoOpenWindowToAppTest(private val testSpec: FlickerTestParameter 
        @JvmStatic

        @JvmStatic

        fun getParams(): Collection<FlickerTestParameter> {

        fun getParams(): Collection<FlickerTestParameter> {

            return FlickerTestParameterFactory.getInstance()

            return FlickerTestParameterFactory.getInstance()

                .getConfigNonRotationTests(

                .getConfigNonRotationTests(repetitions = 5)

                    repetitions = 5,

                    supportedNavigationModes = listOf(

                        WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY

                    )

                )

        }

        }

    }

    }

}
 
}

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

+2 −18
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.server.wm.flicker.ime 
import android.app.Instrumentation

import android.app.Instrumentation

import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.Presubmit

import android.view.Surface

import android.view.Surface

import android.view.WindowManagerPolicyConstants

import androidx.test.filters.FlakyTest

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.platform.app.InstrumentationRegistry
@@ -29,13 +28,10 @@ import com.android.server.wm.flicker.FlickerTestParameter 
import com.android.server.wm.flicker.FlickerTestParameterFactory

import com.android.server.wm.flicker.FlickerTestParameterFactory

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

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

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

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

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

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

import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.navBarLayerRotatesAndScales

import com.android.server.wm.flicker.navBarLayerRotatesAndScales

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.noUncoveredRegions

import com.android.server.wm.flicker.noUncoveredRegions

import com.android.server.wm.flicker.repetitions

import com.android.server.wm.flicker.startRotation

import com.android.server.wm.flicker.startRotation

import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.statusBarLayerRotatesScales

import com.android.server.wm.flicker.statusBarLayerRotatesScales
@@ -63,22 +59,15 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete 
    @FlickerBuilderProvider

    @FlickerBuilderProvider

    fun buildFlicker(): FlickerBuilder {

    fun buildFlicker(): FlickerBuilder {

        return FlickerBuilder(instrumentation).apply {

        return FlickerBuilder(instrumentation).apply {

            withTestName { testSpec.name }

            repeat { testSpec.config.repetitions }

            setup {

            setup {

                test {

                    device.wakeUpAndGoToHomeScreen()

                }

                eachRun {

                eachRun {

                    testApp.launchViaIntent(wmHelper)

                    testApp.launchViaIntent(wmHelper)

                    testApp.openIME(device, wmHelper)

                    testApp.openIME(device, wmHelper)

                    this.setRotation(testSpec.config.startRotation)

                }

                }

            }

            }

            teardown {

            teardown {

                test {

                test {

                    testApp.exit()

                    testApp.exit(wmHelper)

                    this.setRotation(Surface.ROTATION_0)

                }

                }

            }

            }

            transitions {

            transitions {
@@ -189,12 +178,7 @@ class CloseImeAutoOpenWindowToHomeTest(private val testSpec: FlickerTestParamete 
        @JvmStatic

        @JvmStatic

        fun getParams(): Collection<FlickerTestParameter> {

        fun getParams(): Collection<FlickerTestParameter> {

            return FlickerTestParameterFactory.getInstance()

            return FlickerTestParameterFactory.getInstance()

                .getConfigNonRotationTests(

                .getConfigNonRotationTests(repetitions = 5)

                    repetitions = 5,

                    supportedNavigationModes = listOf(

                        WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY

                    )

                )

        }

        }

    }

    }

}
 
}

tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeWindowToAppTest.kt

+24 −19
Original line number Original line Diff line number Diff line
@@ -18,8 +18,7 @@ package com.android.server.wm.flicker.ime 




import android.app.Instrumentation

import android.app.Instrumentation

import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.FlakyTest

import android.view.WindowManagerPolicyConstants

import androidx.test.filters.RequiresDevice

import androidx.test.filters.RequiresDevice

import androidx.test.platform.app.InstrumentationRegistry

import androidx.test.platform.app.InstrumentationRegistry

import com.android.server.wm.flicker.FlickerBuilderProvider

import com.android.server.wm.flicker.FlickerBuilderProvider
@@ -28,16 +27,14 @@ import com.android.server.wm.flicker.FlickerTestParameter 
import com.android.server.wm.flicker.FlickerTestParameterFactory

import com.android.server.wm.flicker.FlickerTestParameterFactory

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

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

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

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

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

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

import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.navBarLayerRotatesAndScales

import com.android.server.wm.flicker.navBarLayerRotatesAndScales

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.noUncoveredRegions

import com.android.server.wm.flicker.noUncoveredRegions

import com.android.server.wm.flicker.repetitions

import com.android.server.wm.flicker.startRotation

import com.android.server.wm.flicker.startRotation

import com.android.server.wm.flicker.statusBarLayerRotatesScales

import com.android.server.wm.flicker.statusBarLayerRotatesScales

import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible

import org.junit.Assume

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

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

import org.junit.FixMethodOrder

import org.junit.FixMethodOrder

import org.junit.Test

import org.junit.Test
@@ -60,13 +57,9 @@ class CloseImeWindowToAppTest(private val testSpec: FlickerTestParameter) { 
    @FlickerBuilderProvider

    @FlickerBuilderProvider

    fun buildFlicker(): FlickerBuilder {

    fun buildFlicker(): FlickerBuilder {

        return FlickerBuilder(instrumentation).apply {

        return FlickerBuilder(instrumentation).apply {

            withTestName { testSpec.name }

            repeat { testSpec.config.repetitions }

            setup {

            setup {

                test {

                test {

                    device.wakeUpAndGoToHomeScreen()

                    testApp.launchViaIntent()

                    testApp.launchViaIntent()

                    this.setRotation(testSpec.config.startRotation)

                }

                }

                eachRun {

                eachRun {

                    testApp.openIME(device, wmHelper)

                    testApp.openIME(device, wmHelper)
@@ -74,8 +67,7 @@ class CloseImeWindowToAppTest(private val testSpec: FlickerTestParameter) { 
            }

            }

            teardown {

            teardown {

                test {

                test {

                    testApp.exit()

                    testApp.exit(wmHelper)

                    this.setRotation(Surface.ROTATION_0)

                }

                }

            }

            }

            transitions {

            transitions {
@@ -120,13 +112,31 @@ class CloseImeWindowToAppTest(private val testSpec: FlickerTestParameter) { 




    @Presubmit

    @Presubmit

    @Test

    @Test

    fun navBarLayerRotatesAndScales() =

    fun navBarLayerRotatesAndScales() {

        Assume.assumeFalse(testSpec.isRotated)

        testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation)

        testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation)

    }



    @FlakyTest

    @Test

    fun navBarLayerRotatesAndScales_Flaky() {

        Assume.assumeTrue(testSpec.isRotated)

        testSpec.navBarLayerRotatesAndScales(testSpec.config.startRotation)

    }





    @Presubmit

    @Presubmit

    @Test

    @Test

    fun statusBarLayerRotatesScales() =

    fun statusBarLayerRotatesScales() {

        Assume.assumeFalse(testSpec.isRotated)

        testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation)

        testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation)

    }



    @FlakyTest

    @Test

    fun statusBarLayerRotatesScales_Flaky() {

        Assume.assumeTrue(testSpec.isRotated)

        testSpec.statusBarLayerRotatesScales(testSpec.config.startRotation)

    }





    @Presubmit

    @Presubmit

    @Test

    @Test
@@ -149,12 +159,7 @@ class CloseImeWindowToAppTest(private val testSpec: FlickerTestParameter) { 
        @JvmStatic

        @JvmStatic

        fun getParams(): Collection<FlickerTestParameter> {

        fun getParams(): Collection<FlickerTestParameter> {

            return FlickerTestParameterFactory.getInstance()

            return FlickerTestParameterFactory.getInstance()

                .getConfigNonRotationTests(

                .getConfigNonRotationTests(repetitions = 5)

                    repetitions = 5,

                    supportedNavigationModes = listOf(

                        WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY

                    )

                )

        }

        }

    }

    }

}
 
}
 
 No newline at end of file

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

+1 −10
Original line number Original line Diff line number Diff line
@@ -29,13 +29,10 @@ import com.android.server.wm.flicker.FlickerTestParameter 
import com.android.server.wm.flicker.FlickerTestParameterFactory

import com.android.server.wm.flicker.FlickerTestParameterFactory

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

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

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

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

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

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

import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.navBarLayerRotatesAndScales

import com.android.server.wm.flicker.navBarLayerRotatesAndScales

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.noUncoveredRegions

import com.android.server.wm.flicker.noUncoveredRegions

import com.android.server.wm.flicker.repetitions

import com.android.server.wm.flicker.startRotation

import com.android.server.wm.flicker.startRotation

import com.android.server.wm.flicker.statusBarLayerRotatesScales

import com.android.server.wm.flicker.statusBarLayerRotatesScales

import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.statusBarWindowIsAlwaysVisible
@@ -61,15 +58,9 @@ class CloseImeWindowToHomeTest(private val testSpec: FlickerTestParameter) { 
    @FlickerBuilderProvider

    @FlickerBuilderProvider

    fun buildFlicker(): FlickerBuilder {

    fun buildFlicker(): FlickerBuilder {

        return FlickerBuilder(instrumentation).apply {

        return FlickerBuilder(instrumentation).apply {

            withTestName { testSpec.name }

            repeat { testSpec.config.repetitions }

            setup {

            setup {

                test {

                    device.wakeUpAndGoToHomeScreen()

                }

                eachRun {

                eachRun {

                    testApp.launchViaIntent(wmHelper)

                    testApp.launchViaIntent(wmHelper)

                    this.setRotation(testSpec.config.startRotation)

                    testApp.openIME(device, wmHelper)

                    testApp.openIME(device, wmHelper)

                }

                }

            }

            }
@@ -85,7 +76,6 @@ class CloseImeWindowToHomeTest(private val testSpec: FlickerTestParameter) { 
                }

                }

                test {

                test {

                    testApp.exit()

                    testApp.exit()

                    this.setRotation(Surface.ROTATION_0)

                }

                }

            }

            }

        }

        }
@@ -175,6 +165,7 @@ class CloseImeWindowToHomeTest(private val testSpec: FlickerTestParameter) { 
                    repetitions = 5,

                    repetitions = 5,

                    supportedRotations = listOf(Surface.ROTATION_0),

                    supportedRotations = listOf(Surface.ROTATION_0),

                    supportedNavigationModes = listOf(

                    supportedNavigationModes = listOf(

                        WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY,

                        WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY

                        WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY

                    )

                    )

                )

                )

tests/FlickerTests/src/com/android/server/wm/flicker/ime/OpenImeWindowTest.kt

+1 −8
Original line number Original line Diff line number Diff line
@@ -28,8 +28,6 @@ import com.android.server.wm.flicker.FlickerParametersRunnerFactory 
import com.android.server.wm.flicker.FlickerTestParameter

import com.android.server.wm.flicker.FlickerTestParameter

import com.android.server.wm.flicker.FlickerTestParameterFactory

import com.android.server.wm.flicker.FlickerTestParameterFactory

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

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

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

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

import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.navBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.navBarLayerRotatesAndScales

import com.android.server.wm.flicker.navBarLayerRotatesAndScales

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible

import com.android.server.wm.flicker.navBarWindowIsAlwaysVisible
@@ -37,7 +35,6 @@ import com.android.server.wm.flicker.noUncoveredRegions 
import com.android.server.wm.flicker.appWindowAlwaysVisibleOnTop

import com.android.server.wm.flicker.appWindowAlwaysVisibleOnTop

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

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

import com.android.server.wm.flicker.layerAlwaysVisible

import com.android.server.wm.flicker.layerAlwaysVisible

import com.android.server.wm.flicker.repetitions

import com.android.server.wm.flicker.startRotation

import com.android.server.wm.flicker.startRotation

import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.statusBarLayerIsAlwaysVisible

import com.android.server.wm.flicker.statusBarLayerRotatesScales

import com.android.server.wm.flicker.statusBarLayerRotatesScales
@@ -64,13 +61,9 @@ class OpenImeWindowTest(private val testSpec: FlickerTestParameter) { 
    @FlickerBuilderProvider

    @FlickerBuilderProvider

    fun buildFlicker(): FlickerBuilder {

    fun buildFlicker(): FlickerBuilder {

        return FlickerBuilder(instrumentation).apply {

        return FlickerBuilder(instrumentation).apply {

            withTestName { testSpec.name }

            repeat { testSpec.config.repetitions }

            setup {

            setup {

                test {

                test {

                    device.wakeUpAndGoToHomeScreen()

                    testApp.launchViaIntent(wmHelper)

                    testApp.launchViaIntent(wmHelper)

                    this.setRotation(testSpec.config.startRotation)

                }

                }

            }

            }

            transitions {

            transitions {
@@ -82,7 +75,6 @@ class OpenImeWindowTest(private val testSpec: FlickerTestParameter) { 
                }

                }

                test {

                test {

                    testApp.exit()

                    testApp.exit()

                    this.setRotation(Surface.ROTATION_0)

                }

                }

            }

            }

        }

        }
@@ -177,6 +169,7 @@ class OpenImeWindowTest(private val testSpec: FlickerTestParameter) { 
                    repetitions = 5,

                    repetitions = 5,

                    supportedRotations = listOf(Surface.ROTATION_0),

                    supportedRotations = listOf(Surface.ROTATION_0),

                    supportedNavigationModes = listOf(

                    supportedNavigationModes = listOf(

                        WindowManagerPolicyConstants.NAV_BAR_MODE_3BUTTON_OVERLAY,

                        WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY

                        WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY

                    )

                    )

                )

                )