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

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

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

parents 7003e6d3 5b0f9fa4

tests/FlickerTests/src/com/android/server/wm/flicker/rotation/ChangeAppRotationTest.kt

+1 −7
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.server.wm.flicker.rotation

package com.android.server.wm.flicker.rotation





import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.Presubmit

import android.view.WindowManagerPolicyConstants

import androidx.test.filters.RequiresDevice

import androidx.test.filters.RequiresDevice

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

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

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

import com.android.server.wm.flicker.FlickerTestParameter
@@ -71,12 +70,7 @@ class ChangeAppRotationTest( 
        @JvmStatic

        @JvmStatic

        fun getParams(): Collection<FlickerTestParameter> {

        fun getParams(): Collection<FlickerTestParameter> {

            return FlickerTestParameterFactory.getInstance()

            return FlickerTestParameterFactory.getInstance()

                .getConfigRotationTests(

                .getConfigRotationTests(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/rotation/RotationTransition.kt

+0 −7
Original line number Original line Diff line number Diff line
@@ -28,12 +28,10 @@ import com.android.server.wm.flicker.focusDoesNotChange 
import com.android.server.wm.flicker.helpers.StandardAppHelper

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

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

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

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

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
@@ -48,12 +46,7 @@ abstract class RotationTransition(protected val testSpec: FlickerTestParameter) 
    protected val endingPos get() = WindowUtils.getDisplayBounds(testSpec.config.endRotation)

    protected val endingPos get() = WindowUtils.getDisplayBounds(testSpec.config.endRotation)





    protected open val transition: FlickerBuilder.(Map<String, Any?>) -> Unit = {

    protected open val transition: FlickerBuilder.(Map<String, Any?>) -> Unit = {

        withTestName { testSpec.name }

        repeat { testSpec.config.repetitions }

        setup {

        setup {

            test {

                device.wakeUpAndGoToHomeScreen()

            }

            eachRun {

            eachRun {

                this.setRotation(testSpec.config.startRotation)

                this.setRotation(testSpec.config.startRotation)

            }

            }

tests/FlickerTests/src/com/android/server/wm/flicker/rotation/SeamlessAppRotationTest.kt

+1 −7
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.server.wm.flicker.rotation

package com.android.server.wm.flicker.rotation





import android.platform.test.annotations.Presubmit

import android.platform.test.annotations.Presubmit

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 com.android.server.wm.flicker.FlickerParametersRunnerFactory

import com.android.server.wm.flicker.FlickerParametersRunnerFactory
@@ -104,12 +103,7 @@ class SeamlessAppRotationTest( 




        @JvmStatic

        @JvmStatic

        private fun getConfigurations(): List<FlickerTestParameter> {

        private fun getConfigurations(): List<FlickerTestParameter> {

            return testFactory.getConfigRotationTests(

            return testFactory.getConfigRotationTests(repetitions = 2).flatMap {

                repetitions = 2,

                supportedNavigationModes = listOf(

                    WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL_OVERLAY

                )

            ).flatMap {

                val defaultRun = it.createConfig(starveUiThread = false)

                val defaultRun = it.createConfig(starveUiThread = false)

                val busyUiRun = it.createConfig(starveUiThread = true)

                val busyUiRun = it.createConfig(starveUiThread = true)

                listOf(

                listOf(