Merge "Add flicker test for minimum window size constraints." into main (e0855420) · Commits · e / os / android_frameworks_base

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

+76 −70

Original line number	Diff line number	Diff line
		@@ -21,11 +21,10 @@ import android.tools.flicker.assertors.assertions.AppLayerIsInvisibleAtEnd
		import android.tools.flicker.assertors.assertions.AppLayerIsVisibleAlways
		import android.tools.flicker.assertors.assertions.AppLayerIsVisibleAtStart
		import android.tools.flicker.assertors.assertions.AppWindowHasDesktopModeInitialBoundsAtTheEnd
		import android.tools.flicker.assertors.assertions.AppWindowHasSizeOfAtLeast
		import android.tools.flicker.assertors.assertions.AppWindowIsInvisibleAtEnd
		import android.tools.flicker.assertors.assertions.AppWindowIsVisibleAlways
		import android.tools.flicker.assertors.assertions.AppWindowOnTopAtEnd
		import android.tools.flicker.assertors.assertions.AppWindowOnTopAtStart
		import android.tools.flicker.assertors.assertions.AppWindowRemainInsideDisplayBounds
		import android.tools.flicker.assertors.assertions.LauncherWindowReplacesAppAsTopWindow
		import android.tools.flicker.config.AssertionTemplates
		import android.tools.flicker.config.FlickerConfigEntry
		@@ -66,8 +65,7 @@ class DesktopModeFlickerScenarios {
		AppWindowHasDesktopModeInitialBoundsAtTheEnd(
		Components.DESKTOP_MODE_APP
		)
		)
		.associateBy({ it }, { AssertionInvocationGroup.BLOCKING }),
		).associateBy({ it }, { AssertionInvocationGroup.BLOCKING }),
		)

		// Use this scenario for closing an app in desktop windowing, except the last app. For the
		@@ -98,8 +96,7 @@ class DesktopModeFlickerScenarios {
		AppWindowOnTopAtStart(Components.DESKTOP_MODE_APP),
		AppLayerIsVisibleAtStart(Components.DESKTOP_MODE_APP),
		AppLayerIsInvisibleAtEnd(Components.DESKTOP_MODE_APP),
		)
		.associateBy({ it }, { AssertionInvocationGroup.BLOCKING }),
		).associateBy({ it }, { AssertionInvocationGroup.BLOCKING }),
		)

		val CLOSE_LAST_APP =
		@@ -126,8 +123,7 @@ class DesktopModeFlickerScenarios {
		AppWindowIsInvisibleAtEnd(Components.DESKTOP_MODE_APP),
		LauncherWindowReplacesAppAsTopWindow(Components.DESKTOP_MODE_APP),
		AppWindowIsInvisibleAtEnd(DESKTOP_WALLPAPER)
		)
		.associateBy({ it }, { AssertionInvocationGroup.BLOCKING }),
		).associateBy({ it }, { AssertionInvocationGroup.BLOCKING }),
		)

		val CORNER_RESIZE =
		@@ -140,13 +136,23 @@ class DesktopModeFlickerScenarios {
		TaggedCujTransitionMatcher(associatedTransitionRequired = false)
		)
		.build(),
		assertions = AssertionTemplates.DESKTOP_MODE_APP_VISIBILITY_ASSERTIONS
		)

		val CORNER_RESIZE_TO_MINIMUM_SIZE =
		FlickerConfigEntry(
		scenarioId = ScenarioId("CORNER_RESIZE_TO_MINIMUM_SIZE"),
		extractor =
		TaggedScenarioExtractorBuilder()
		.setTargetTag(CujType.CUJ_DESKTOP_MODE_RESIZE_WINDOW)
		.setTransitionMatcher(
		TaggedCujTransitionMatcher(associatedTransitionRequired = false)
		).build(),
		assertions =
		AssertionTemplates.DESKTOP_MODE_APP_VISIBILITY_ASSERTIONS +
		listOf(
		AppWindowIsVisibleAlways(Components.DESKTOP_MODE_APP),
		AppWindowOnTopAtEnd(Components.DESKTOP_MODE_APP),
		AppWindowRemainInsideDisplayBounds(Components.DESKTOP_MODE_APP),
		)
		.associateBy({ it }, { AssertionInvocationGroup.BLOCKING }),
		AppWindowHasSizeOfAtLeast(Components.DESKTOP_MODE_APP, 770, 700)
		).associateBy({ it }, { AssertionInvocationGroup.BLOCKING }),
		)
		}
		}
		No newline at end of file

libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/flicker/ResizeAppToMinimumWindowSizeLandscape.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.service.desktopmode.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.service.desktopmode.flicker.DesktopModeFlickerScenarios.Companion.CORNER_RESIZE_TO_MINIMUM_SIZE
		import com.android.wm.shell.flicker.service.desktopmode.scenarios.ResizeAppWithCornerResize
		import org.junit.Test
		import org.junit.runner.RunWith

		/**
		* Resize app window using corner resize to the smallest possible height and width in
		* landscape mode.
		*
		* Assert that the minimum window size constraint is maintained.
		*/
		@RunWith(FlickerServiceJUnit4ClassRunner::class)
		class ResizeAppToMinimumWindowSizeLandscape : ResizeAppWithCornerResize(
		rotation = Rotation.ROTATION_90,
		horizontalChange = -1500,
		verticalChange = 1500) {
		@ExpectedScenarios(["CORNER_RESIZE_TO_MINIMUM_SIZE"])
		@Test
		override fun resizeAppWithCornerResize() = super.resizeAppWithCornerResize()

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

libs/WindowManager/Shell/tests/flicker/service/src/com/android/wm/shell/flicker/service/desktopmode/flicker/ResizeAppToMinimumWindowSizePortrait.kt

0 → 100644

+48 −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.service.desktopmode.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.service.desktopmode.flicker.DesktopModeFlickerScenarios.Companion.CORNER_RESIZE_TO_MINIMUM_SIZE
		import com.android.wm.shell.flicker.service.desktopmode.scenarios.ResizeAppWithCornerResize
		import org.junit.Test
		import org.junit.runner.RunWith

		/**
		* Resize app window using corner resize to the smallest possible height and width in portrait mode.
		*
		* Assert that the minimum window size constraint is maintained.
		*/
		@RunWith(FlickerServiceJUnit4ClassRunner::class)
		class ResizeAppToMinimumWindowSizePortrait : ResizeAppWithCornerResize(horizontalChange = -1500,
		verticalChange = 1500) {
		@ExpectedScenarios(["CORNER_RESIZE_TO_MINIMUM_SIZE"])
		@Test
		override fun resizeAppWithCornerResize() = super.resizeAppWithCornerResize()

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

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

+11 −3

Original line number	Diff line number	Diff line
		@@ -38,7 +38,9 @@ import org.junit.Test
		@Ignore("Base Test Class")
		abstract class ResizeAppWithCornerResize
		@JvmOverloads
		constructor(val rotation: Rotation = Rotation.ROTATION_0) {
		constructor(val rotation: Rotation = Rotation.ROTATION_0,
		val horizontalChange: Int = 50,
		val verticalChange: Int = -50) {

		private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()
		private val tapl = LauncherInstrumentation()
		@@ -46,7 +48,9 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) {
		private val device = UiDevice.getInstance(instrumentation)
		private val testApp = DesktopModeAppHelper(SimpleAppHelper(instrumentation))

		@Rule @JvmField val testSetupRule = Utils.testSetupRule(NavBar.MODE_GESTURAL, rotation)
		@Rule
		@JvmField
		val testSetupRule = Utils.testSetupRule(NavBar.MODE_GESTURAL, rotation)

		@Before
		fun setup() {
		@@ -58,7 +62,11 @@ constructor(val rotation: Rotation = Rotation.ROTATION_0) {

		@Test
		open fun resizeAppWithCornerResize() {
		testApp.cornerResize(wmHelper, device, DesktopModeAppHelper.Corners.RIGHT_TOP, 50, -50)
		testApp.cornerResize(wmHelper,
		device,
		DesktopModeAppHelper.Corners.RIGHT_TOP,
		horizontalChange,
		verticalChange)
		}

		@After