b/418205309 Migrate MaximizeApp to legacy flicker test (aeee406c) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/MaximizeAppPortrait.kt

deleted100644 → 0

+0 −51

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.wm.shell.flicker

		import android.tools.flicker.FlickerConfig
		import android.tools.flicker.annotation.ExpectedScenarios
		import android.tools.flicker.annotation.FlickerConfigProvider
		import android.tools.flicker.config.FlickerConfig
		import android.tools.flicker.config.FlickerServiceConfig
		import android.tools.flicker.junit.FlickerServiceJUnit4ClassRunner
		import androidx.test.filters.RequiresDevice
		import com.android.wm.shell.flicker.DesktopModeFlickerScenarios.Companion.MAXIMIZE_APP
		import com.android.wm.shell.scenarios.MaximizeAppWindow
		import org.junit.Test
		import org.junit.runner.RunWith

		/**
		* Maximize app window by pressing the maximize button on the app header.
		*
		* Assert that the app window keeps the same increases in size, filling the vertical and horizontal
		* stable display bounds.
		*/
		@RequiresDevice
		@RunWith(FlickerServiceJUnit4ClassRunner::class)
		class MaximizeAppPortrait : MaximizeAppWindow() {
		@ExpectedScenarios(["MAXIMIZE_APP"])
		@Test
		override fun maximizeAppWindow() = super.maximizeAppWindow()


		companion object {
		@JvmStatic
		@FlickerConfigProvider
		fun flickerConfigProvider(): FlickerConfig =
		FlickerConfig().use(FlickerServiceConfig.DEFAULT).use(MAXIMIZE_APP)
		}
		}
		No newline at end of file

libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/MaximizeAppLandscape.kt→libs/WindowManager/Shell/tests/e2e/desktopmode/flicker-service/src/com/android/wm/shell/flicker/fundamentals/MaximizeAppFlickerTest.kt

+88 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		* Copyright (C) 2025 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -14,20 +14,25 @@
		* limitations under the License.
		*/

		package com.android.wm.shell.flicker

		import android.tools.Rotation.ROTATION_90
		import android.tools.flicker.FlickerConfig
		import android.tools.flicker.annotation.ExpectedScenarios
		import android.tools.flicker.annotation.FlickerConfigProvider
		import android.tools.flicker.config.FlickerConfig
		import android.tools.flicker.config.FlickerServiceConfig
		import android.tools.flicker.junit.FlickerServiceJUnit4ClassRunner
		import androidx.test.filters.RequiresDevice
		import com.android.wm.shell.flicker.DesktopModeFlickerScenarios.Companion.MAXIMIZE_APP
		package com.android.wm.shell.flicker.fundamentals

		import android.platform.test.annotations.RequiresDevice
		import android.tools.NavBar
		import android.tools.flicker.assertions.FlickerTest
		import android.tools.flicker.junit.FlickerParametersRunnerFactory
		import android.tools.flicker.legacy.FlickerBuilder
		import android.tools.flicker.legacy.LegacyFlickerTest
		import android.tools.flicker.legacy.LegacyFlickerTestFactory
		import com.android.wm.shell.flicker.DesktopModeBaseTest
		import com.android.wm.shell.scenarios.MaximizeAppWindow
		import com.android.wm.shell.Utils
		import com.android.wm.shell.flicker.utils.appLayerHasMaxDisplayHeightAtEnd
		import com.android.wm.shell.flicker.utils.appLayerHasMaxDisplayWidthAtEnd
		import com.android.wm.shell.flicker.utils.resizeVeilKeepsIncreasingInSize
		import org.junit.Rule
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.junit.runners.Parameterized

		/**
		* Maximize app window by pressing the maximize button on the app header.
		@@ -35,18 +40,49 @@ import org.junit.runner.RunWith
		* Assert that the app window keeps the same increases in size, filling the vertical and horizontal
		* stable display bounds.
		*/

		@RequiresDevice
		@RunWith(FlickerServiceJUnit4ClassRunner::class)
		class MaximizeAppLandscape : MaximizeAppWindow(rotation = ROTATION_90) {
		@ExpectedScenarios(["MAXIMIZE_APP"])
		@RunWith(Parameterized::class)
		@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)
		class MaximizeAppFlickerTest(flicker: LegacyFlickerTest) : DesktopModeBaseTest(flicker) {

		inner class MaximizeAppScenario : MaximizeAppWindow(flicker.scenario.startRotation)

		@Rule
		@JvmField
		val testSetupRule = Utils.testSetupRule(NavBar.MODE_GESTURAL, flicker.scenario.startRotation)
		val scenario = MaximizeAppScenario()
		private val testApp = scenario.testApp

		override val transition: FlickerBuilder.() -> Unit
		get() = {
		setup {
		scenario.setup()
		}
		transitions {
		scenario.maximizeAppWindow()
		}
		teardown {
		scenario.teardown()
		}
		}

		@Test
		override fun maximizeAppWindow() = super.maximizeAppWindow()
		fun appLayerHasMaxDisplayHeightAtEnd() = flicker.appLayerHasMaxDisplayHeightAtEnd(testApp)

		@Test
		fun appLayerHasMaxDisplayWidthAtEnd() = flicker.appLayerHasMaxDisplayWidthAtEnd(testApp)

		@Test
		fun resizeVeilKeepsIncreasingInSize() = flicker.resizeVeilKeepsIncreasingInSize(testApp)

		companion object {
		@Parameterized.Parameters(name = "{0}")
		@JvmStatic
		@FlickerConfigProvider
		fun flickerConfigProvider(): FlickerConfig =
		FlickerConfig().use(FlickerServiceConfig.DEFAULT).use(MAXIMIZE_APP)
		fun getParams(): Collection<FlickerTest> {
		return LegacyFlickerTestFactory.nonRotationTests(
		supportedNavigationModes = listOf(NavBar.MODE_GESTURAL)
		)
		}
		}
		}

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/functional/MaximizeAppWindowTest.kt→libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/functional/fundamentals/MaximizeAppWindowTest.kt

+2 −2

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2024 The Android Open Source Project
		* Copyright (C) 2025 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		package com.android.wm.shell.functional
		package com.android.wm.shell.functional.fundamentals

		import android.platform.test.annotations.Postsubmit
		import android.platform.test.rule.ScreenRecordRule

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/MaximizeAppWindow.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ abstract class MaximizeAppWindow(
		private val tapl = LauncherInstrumentation()
		private val wmHelper = WindowManagerStateHelper(instrumentation)
		private val device = UiDevice.getInstance(instrumentation)
		private val testApp = if (isResizable) {
		val testApp = if (isResizable) {
		DesktopModeAppHelper(SimpleAppHelper(instrumentation))
		} else {
		DesktopModeAppHelper(NonResizeableAppHelper(instrumentation))