Merge "Add flicker test for maximum window size constraint." into main (500078bc) · Commits · e / os / android_frameworks_base

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

+19 −0

Original line number	Diff line number	Diff line
		@@ -195,6 +195,25 @@ class DesktopModeFlickerScenarios {
		.associateBy({ it }, { AssertionInvocationGroup.BLOCKING }),
		)

		val CORNER_RESIZE_TO_MAXIMUM_SIZE =
		FlickerConfigEntry(
		scenarioId = ScenarioId("CORNER_RESIZE_TO_MAXIMUM_SIZE"),
		extractor =
		TaggedScenarioExtractorBuilder()
		.setTargetTag(CujType.CUJ_DESKTOP_MODE_RESIZE_WINDOW)
		.setTransitionMatcher(
		TaggedCujTransitionMatcher(associatedTransitionRequired = false)
		)
		.build(),
		assertions =
		AssertionTemplates.DESKTOP_MODE_APP_VISIBILITY_ASSERTIONS +
		listOf(
		AppLayerIncreasesInSize(DESKTOP_MODE_APP),
		AppWindowHasMaxDisplayHeight(DESKTOP_MODE_APP),
		AppWindowHasMaxDisplayWidth(DESKTOP_MODE_APP)
		).associateBy({ it }, { AssertionInvocationGroup.BLOCKING }),
		)

		val SNAP_RESIZE_LEFT_WITH_BUTTON =
		FlickerConfigEntry(
		scenarioId = ScenarioId("SNAP_RESIZE_LEFT_WITH_BUTTON"),

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

0 → 100644

+52 −0

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.Rotation
		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 com.android.wm.shell.flicker.DesktopModeFlickerScenarios.Companion.CORNER_RESIZE_TO_MAXIMUM_SIZE
		import com.android.wm.shell.scenarios.ResizeAppWithCornerResize
		import org.junit.Test
		import org.junit.runner.RunWith

		/**
		* Resize app window using corner resize to the greatest possible height and width in
		* landscape mode.
		*
		* Assert that the maximum window size constraint is maintained.
		*/
		@RunWith(FlickerServiceJUnit4ClassRunner::class)
		class ResizeAppToMaximumWindowSizeLandscape : ResizeAppWithCornerResize(
		rotation = Rotation.ROTATION_90
		) {
		@ExpectedScenarios(["CORNER_RESIZE_TO_MAXIMUM_SIZE"])
		@Test
		override fun resizeAppWithCornerResizeToMaximumSize() =
		super.resizeAppWithCornerResizeToMaximumSize()

		companion object {
		@JvmStatic
		@FlickerConfigProvider
		fun flickerConfigProvider(): FlickerConfig =
		FlickerConfig().use(FlickerServiceConfig.DEFAULT).use(CORNER_RESIZE_TO_MAXIMUM_SIZE)
		}
		}

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

0 → 100644

+49 −0

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 com.android.wm.shell.flicker.DesktopModeFlickerScenarios.Companion.CORNER_RESIZE_TO_MAXIMUM_SIZE
		import com.android.wm.shell.scenarios.ResizeAppWithCornerResize
		import org.junit.Test
		import org.junit.runner.RunWith

		/**
		* Resize app window using corner resize to the greatest possible height and width in
		* portrait mode.
		*
		* Assert that the maximum window size constraint is maintained.
		*/
		@RunWith(FlickerServiceJUnit4ClassRunner::class)
		class ResizeAppToMaximumWindowSizePortrait : ResizeAppWithCornerResize() {
		@ExpectedScenarios(["CORNER_RESIZE_TO_MAXIMUM_SIZE"])
		@Test
		override fun resizeAppWithCornerResizeToMaximumSize() =
		super.resizeAppWithCornerResizeToMaximumSize()

		companion object {
		@JvmStatic
		@FlickerConfigProvider
		fun flickerConfigProvider(): FlickerConfig =
		FlickerConfig().use(FlickerServiceConfig.DEFAULT).use(CORNER_RESIZE_TO_MAXIMUM_SIZE)
		}
		}

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

+20 −2

Original line number	Diff line number	Diff line
		@@ -36,8 +36,7 @@ import org.junit.Rule
		import org.junit.Test

		@Ignore("Test Base Class")
		abstract class ResizeAppWithCornerResize
		constructor(
		abstract class ResizeAppWithCornerResize(
		val rotation: Rotation = Rotation.ROTATION_0,
		val horizontalChange: Int = 200,
		val verticalChange: Int = -200,
		@@ -79,6 +78,25 @@ constructor(
		)
		}

		@Test
		open fun resizeAppWithCornerResizeToMaximumSize() {
		val maxResizeChange = 3000
		testApp.cornerResize(
		wmHelper,
		device,
		DesktopModeAppHelper.Corners.RIGHT_TOP,
		maxResizeChange,
		-maxResizeChange
		)
		testApp.cornerResize(
		wmHelper,
		device,
		DesktopModeAppHelper.Corners.LEFT_BOTTOM,
		-maxResizeChange,
		maxResizeChange
		)
		}

		@After
		fun teardown() {
		testApp.exit(wmHelper)