[59/n] Create TransitionObserverTestContext and clean up (1f854a56) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/compatui/letterbox/lifecycle/LetterboxLifecycleEvent.kt

+0 −34

Original line number	Diff line number	Diff line
		@@ -60,37 +60,3 @@ fun Change.asLetterboxLifecycleEventType() = when {
		isOpeningType(mode) -> OPEN
		else -> NONE
		}

		/**
		* Creates a [LetterboxLifecycleEvent] from the information in a [Change].
		*/
		// TODO(b/375339716): Clean code and improve readability.
		fun Change.toLetterboxLifecycleEvent(): LetterboxLifecycleEvent {
		val taskBounds = Rect(
		endRelOffset.x,
		endRelOffset.y,
		endAbsBounds.width(),
		endAbsBounds.height()
		)

		val type = when {
		isClosingType(mode) -> CLOSE
		isOpeningType(mode) -> OPEN
		else -> NONE
		}

		val isLetterboxed = taskInfo?.appCompatTaskInfo?.isTopActivityLetterboxed ?: false
		// Letterbox bounds are null when the activity is not letterboxed.
		val letterboxBounds =
		if (isLetterboxed) taskInfo?.appCompatTaskInfo?.topActivityLetterboxBounds else null

		return LetterboxLifecycleEvent(
		type = type,
		displayId = taskInfo?.displayId ?: -1,
		taskId = taskInfo?.taskId ?: -1,
		taskBounds = taskBounds,
		letterboxBounds = letterboxBounds,
		containerToken = taskInfo?.token,
		taskLeash = leash
		)
		}

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterbox/DelegateLetterboxTransitionObserverTest.kt

+16 −22

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.wm.shell.compatui.letterbox

		import android.graphics.Rect
		import android.platform.test.annotations.DisableFlags
		import android.platform.test.annotations.EnableFlags
		import android.testing.AndroidTestingRunner
		@@ -27,17 +28,16 @@ import com.android.wm.shell.common.ShellExecutor
		import com.android.wm.shell.compatui.letterbox.lifecycle.FakeLetterboxLifecycleEventFactory
		import com.android.wm.shell.compatui.letterbox.lifecycle.LetterboxLifecycleController
		import com.android.wm.shell.compatui.letterbox.lifecycle.LetterboxLifecycleEvent
		import com.android.wm.shell.compatui.letterbox.lifecycle.toLetterboxLifecycleEvent
		import com.android.wm.shell.sysui.ShellInit
		import com.android.wm.shell.transition.Transitions
		import com.android.wm.shell.util.executeTransitionObserverTest
		import java.util.function.Consumer
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.mockito.Mockito.times
		import org.mockito.kotlin.any
		import org.mockito.kotlin.mock
		import org.mockito.kotlin.verify
		import java.util.function.Consumer

		/**
		* Tests for [DelegateLetterboxTransitionObserver].
		@@ -76,12 +76,9 @@ class DelegateLetterboxTransitionObserverTest : ShellTestCase() {
		runTestScenario { r ->
		executeTransitionObserverTest(observerFactory = r.observerFactory) {
		r.invokeShellInit()

		inputBuilder {
		buildTransitionInfo()
		transitionInfo {
		}

		validateOutput {
		validateOnTransitionReady {
		r.checkLifecycleControllerInvoked(times = 0)
		}
		}
		@@ -93,13 +90,10 @@ class DelegateLetterboxTransitionObserverTest : ShellTestCase() {
		runTestScenario { r ->
		executeTransitionObserverTest(observerFactory = r.observerFactory) {
		r.invokeShellInit()

		inputBuilder {
		buildTransitionInfo()
		addChange(createChange())
		transitionInfo {
		addChange { }
		}

		validateOutput {
		validateOnTransitionReady {
		r.checkLifecycleControllerInvoked(times = 1)
		}
		}
		@@ -111,15 +105,12 @@ class DelegateLetterboxTransitionObserverTest : ShellTestCase() {
		runTestScenario { r ->
		executeTransitionObserverTest(observerFactory = r.observerFactory) {
		r.invokeShellInit()

		inputBuilder {
		buildTransitionInfo()
		addChange(createChange())
		addChange(createChange())
		addChange(createChange())
		transitionInfo {
		addChange { }
		addChange { }
		addChange { }
		}

		validateOutput {
		validateOnTransitionReady {
		r.checkLifecycleControllerInvoked(times = 3)
		r.checkOnLetterboxLifecycleEventFactory { factory ->
		assert(factory.canHandleInvokeTimes == 3)
		@@ -146,6 +137,9 @@ class DelegateLetterboxTransitionObserverTest : ShellTestCase() {
		private val letterboxLifecycleController: LetterboxLifecycleController
		private var letterboxLifecycleEventFactory: FakeLetterboxLifecycleEventFactory

		private var inputEvent: LetterboxLifecycleEvent? =
		LetterboxLifecycleEvent(taskBounds = Rect())

		val observerFactory: () -> DelegateLetterboxTransitionObserver

		init {
		@@ -154,7 +148,7 @@ class DelegateLetterboxTransitionObserverTest : ShellTestCase() {
		transitions = mock<Transitions>()
		letterboxLifecycleController = mock<LetterboxLifecycleController>()
		letterboxLifecycleEventFactory = FakeLetterboxLifecycleEventFactory(
		eventToReturnFactory = { c -> c.toLetterboxLifecycleEvent() }
		eventToReturnFactory = { _ -> inputEvent }
		)
		letterboxObserver =
		DelegateLetterboxTransitionObserver(

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterbox/lifecycle/LetterboxLifecycleControllerImplTest.kt

+0 −9

Original line number	Diff line number	Diff line
		@@ -44,15 +44,6 @@ import org.mockito.kotlin.verify
		@SmallTest
		class LetterboxLifecycleControllerImplTest : ShellTestCase() {

		@Test
		fun `this is my test`() {
		runTestScenario { r ->
		r.invokeLifecycleControllerWith(
		r.createLifecycleEvent()
		)
		}
		}

		@Test
		fun `Letterbox is hidden with OPEN Transition but not letterboxed`() {
		runTestScenario { r ->

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/compatui/letterbox/lifecycle/LetterboxLifecycleEventTest.kt

deleted100644 → 0

+0 −264

Original line number	Diff line number	Diff line
		/*
		* 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.
		* 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.compatui.letterbox.lifecycle

		import android.app.ActivityManager.RunningTaskInfo
		import android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM
		import android.content.ComponentName
		import android.content.Intent
		import android.graphics.Point
		import android.graphics.Rect
		import android.testing.AndroidTestingRunner
		import android.view.Display.DEFAULT_DISPLAY
		import android.view.SurfaceControl
		import android.view.WindowManager.TRANSIT_CLOSE
		import android.view.WindowManager.TRANSIT_NONE
		import android.view.WindowManager.TRANSIT_OPEN
		import android.view.WindowManager.TRANSIT_PIP
		import android.window.IWindowContainerToken
		import android.window.TransitionInfo.Change
		import android.window.TransitionInfo.ChangeFlags
		import android.window.TransitionInfo.FLAG_NONE
		import android.window.TransitionInfo.TransitionMode
		import android.window.WindowContainerToken
		import androidx.test.filters.SmallTest
		import com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn
		import com.android.wm.shell.ShellTestCase
		import com.android.wm.shell.compatui.letterbox.LetterboxKey
		import com.android.wm.shell.compatui.letterbox.lifecycle.LetterboxLifecycleEventType.CLOSE
		import com.android.wm.shell.compatui.letterbox.lifecycle.LetterboxLifecycleEventType.NONE
		import com.android.wm.shell.compatui.letterbox.lifecycle.LetterboxLifecycleEventType.OPEN
		import java.util.function.Consumer
		import kotlin.test.assertEquals
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.mockito.kotlin.doReturn
		import org.mockito.kotlin.mock

		/**
		* Tests for [LetterboxLifecycleControllerImpl].
		*
		* Build/Install/Run:
		* atest WMShellUnitTests:LetterboxLifecycleEventTest
		*/
		@RunWith(AndroidTestingRunner::class)
		@SmallTest
		class LetterboxLifecycleEventTest : ShellTestCase() {

		@Test
		fun `Type is OPEN with open transition`() {
		runTestScenario { r ->
		r.configureChange(changeMode = TRANSIT_OPEN)
		r.createLetterboxLifecycleEvent()
		r.checkEventType(expected = OPEN)
		}
		}

		@Test
		fun `Type is CLOSE with close transition`() {
		runTestScenario { r ->
		r.configureChange(changeMode = TRANSIT_CLOSE)
		r.createLetterboxLifecycleEvent()
		r.checkEventType(expected = CLOSE)
		}
		}

		@Test
		fun `Type is NONE with no open or close transition`() {
		runTestScenario { r ->
		r.configureChange(changeMode = TRANSIT_PIP)
		r.createLetterboxLifecycleEvent()
		r.checkEventType(expected = NONE)
		}
		}

		@Test
		fun `Build correct TaskBounds from Change dim fields`() {
		runTestScenario { r ->
		r.configureChange(
		changeMode = TRANSIT_OPEN,
		endRelOffset = Point(20, 30),
		endAbsBounds = Rect(500, 0, 1500, 1000)
		)
		r.createLetterboxLifecycleEvent()
		r.checkEventType(expected = OPEN)
		r.checkTaskBounds(expected = Rect(20, 30, 1000, 1000))
		}
		}

		@Test
		fun `When not letterboxed letterboxBounds are null`() {
		runTestScenario { r ->
		r.configureChange(
		changeMode = TRANSIT_OPEN,
		changeTaskInfo = r.createTaskInfo().apply {
		appCompatTaskInfo.isTopActivityLetterboxed = false
		appCompatTaskInfo.topActivityLetterboxBounds = Rect(500, 0, 1500, 800)
		}
		)
		r.createLetterboxLifecycleEvent()
		r.checkLetterboxBounds(expected = null)
		}
		}

		@Test
		fun `When letterboxed gets correct letterboxBounds`() {
		runTestScenario { r ->
		r.configureChange(
		changeMode = TRANSIT_OPEN,
		changeTaskInfo = r.createTaskInfo().apply {
		appCompatTaskInfo.isTopActivityLetterboxed = true
		appCompatTaskInfo.topActivityLetterboxBounds = Rect(500, 0, 1500, 800)
		}
		)
		r.createLetterboxLifecycleEvent()
		r.checkLetterboxBounds(expected = Rect(500, 0, 1500, 800))
		}
		}

		@Test
		fun `Use correct token`() {
		runTestScenario { r ->
		val testToken: WindowContainerToken = mock()
		r.configureChange(
		changeMode = TRANSIT_OPEN,
		changeTaskInfo = r.createTaskInfo(
		windowToken = testToken
		)
		)
		r.createLetterboxLifecycleEvent()
		r.checkLetterboxActivityToken(expected = testToken)
		}
		}

		@Test
		fun `Use correct Leash for creation`() {
		runTestScenario { r ->
		val testLeash: SurfaceControl = mock()
		r.configureChange(
		changeMode = TRANSIT_OPEN,
		leash = testLeash
		)
		r.createLetterboxLifecycleEvent()
		r.checkTaskLeash(expected = testLeash)
		}
		}

		@Test
		fun `Use correct letterboxKey`() {
		runTestScenario { r ->
		r.configureChange(
		changeMode = TRANSIT_OPEN,
		changeTaskInfo = r.createTaskInfo(
		id = 37,
		taskDisplayId = 28
		)
		)
		r.createLetterboxLifecycleEvent()
		r.checkDisplayId(expected = 28)
		r.checkTaskIdId(expected = 37)
		r.checkLetterboxKey(expected = LetterboxKey(displayId = 28, taskId = 37))
		}
		}

		/**
		* Runs a test scenario providing a Robot.
		*/
		fun runTestScenario(consumer: Consumer<LetterboxLifecycleControllerImplRobotTest>) {
		val robot = LetterboxLifecycleControllerImplRobotTest()
		consumer.accept(robot)
		}

		class LetterboxLifecycleControllerImplRobotTest {

		private var currentChange: Change? = null
		private var event: LetterboxLifecycleEvent? = null

		fun configureChange(
		token: WindowContainerToken? = mock(),
		leash: SurfaceControl = mock(),
		@TransitionMode changeMode: Int = TRANSIT_NONE,
		parentToken: WindowContainerToken? = null,
		changeTaskInfo: RunningTaskInfo? = null,
		@ChangeFlags changeFlags: Int = FLAG_NONE,
		endRelOffset: Point = Point(0, 0),
		endAbsBounds: Rect = Rect()
		) = Change(token, leash).apply {
		mode = changeMode
		parent = parentToken
		taskInfo = changeTaskInfo
		flags = changeFlags
		}.apply {
		currentChange = this
		spyOn(currentChange)
		doReturn(endRelOffset).`when`(currentChange)?.endRelOffset
		doReturn(endAbsBounds).`when`(currentChange)?.endAbsBounds
		}

		fun createTaskInfo(
		id: Int = 0,
		taskDisplayId: Int = DEFAULT_DISPLAY,
		windowingMode: Int = WINDOWING_MODE_FREEFORM,
		windowToken: WindowContainerToken = WindowContainerToken(mock<IWindowContainerToken>())
		) =
		RunningTaskInfo().apply {
		taskId = id
		displayId = taskDisplayId
		configuration.windowConfiguration.windowingMode = windowingMode
		token = windowToken
		baseIntent = Intent().apply {
		component = ComponentName("package", "component.name")
		}
		}

		fun createLetterboxLifecycleEvent() {
		event = currentChange?.toLetterboxLifecycleEvent()
		}

		fun checkEventType(expected: LetterboxLifecycleEventType) {
		assertEquals(expected, event?.type)
		}

		fun checkDisplayId(expected: Int) {
		assertEquals(expected, event?.displayId)
		}

		fun checkTaskIdId(expected: Int) {
		assertEquals(expected, event?.taskId)
		}

		fun checkTaskBounds(expected: Rect?) {
		assertEquals(expected, event?.taskBounds)
		}

		fun checkLetterboxBounds(expected: Rect?) {
		assertEquals(expected, event?.letterboxBounds)
		}

		fun checkLetterboxActivityToken(expected: WindowContainerToken?) {
		assertEquals(expected, event?.containerToken)
		}

		fun checkTaskLeash(expected: SurfaceControl?) {
		assertEquals(expected, event?.taskLeash)
		}

		fun checkLetterboxKey(expected: LetterboxKey) {
		assertEquals(expected, event?.letterboxKey())
		}
		}
		}

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/util/CommonInputBuilders.kt→libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/util/CommonTestInputBuilders.kt

+29 −1

Original line number	Diff line number	Diff line
		@@ -22,8 +22,12 @@ import android.graphics.Point
		import android.graphics.Rect
		import android.view.SurfaceControl
		import android.view.WindowManager.TRANSIT_NONE
		import android.view.WindowManager.TransitionFlags
		import android.view.WindowManager.TransitionType

		import android.window.ActivityTransitionInfo
		import android.window.AppCompatTransitionInfo
		import android.window.TransitionInfo
		import android.window.TransitionInfo.Change
		import android.window.TransitionInfo.TransitionMode
		import android.window.WindowContainerToken
		@@ -62,7 +66,6 @@ class ChangeTestInputBuilder : TestInputBuilder<Change> {
		var endAbsBounds: Rect? = null
		var endRelOffset: Point? = null
		@TransitionMode var mode: Int = TRANSIT_NONE

		data class InputParams(
		var token: WindowContainerToken = mock<WindowContainerToken>(),
		var leash: SurfaceControl = mock<SurfaceControl>(),
		@@ -174,6 +177,31 @@ class ComponentNameTestInputBuilder : TestInputBuilder<ComponentName> {
		override fun build(): ComponentName = ComponentName(packageName, className)
		}

		// [TestInputBuilder] for a [TransitionInfo]
		class TransitionInfoTestInputBuilder : TestInputBuilder<TransitionInfo> {

		@TransitionType
		var type: Int = TRANSIT_NONE

		@TransitionFlags
		var flags: Int = 0

		private val transitionInfoChanges = mutableListOf<Change>()

		fun addChange(builder: ChangeTestInputBuilder.() -> Unit): Change {
		val inputFactoryObj = ChangeTestInputBuilder()
		inputFactoryObj.builder()
		return inputFactoryObj.build().apply {
		transitionInfoChanges.add(this)
		}
		}

		override fun build(): TransitionInfo = TransitionInfo(type, flags)
		.apply {
		transitionInfoChanges.forEach { c -> addChange(c) }
		}
		}

		// [TestInputBuilder] for a [WindowContainerToken]
		class WindowContainerTokenTestInputBuilder