Merge "Format RootTaskDesksOrganizerTest" into main (96854f0f) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/multidesks/RootTaskDesksOrganizerTest.kt

+4 −24

Original line number	Diff line number	Diff line
		@@ -16,13 +16,11 @@
		package com.android.wm.shell.desktopmode.multidesks

		import android.app.ActivityManager
		import android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM
		import android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED
		import android.testing.AndroidTestingRunner
		import android.view.Display.DEFAULT_DISPLAY
		import android.view.SurfaceControl
		import android.view.WindowManager.TRANSIT_TO_FRONT
		import android.window.DesktopExperienceFlags
		import android.window.DisplayAreaInfo
		import android.window.TransitionInfo
		import android.window.WindowContainerToken
		@@ -236,11 +234,7 @@ class RootTaskDesksOrganizerTest : ShellTestCase() {
		organizer.createDesk(userId = PRIMARY_USER_ID, displayId = DEFAULT_DISPLAY) {}

		// Only one desk attempt.
		verify(mockShellTaskOrganizer, times(1))
		.createRootTask(
		any(),
		eq(organizer)
		)
		verify(mockShellTaskOrganizer, times(1)).createRootTask(any(), eq(organizer))
		}

		@Test
		@@ -266,11 +260,7 @@ class RootTaskDesksOrganizerTest : ShellTestCase() {
		organizer.createDesk(userId = PRIMARY_USER_ID, displayId = DEFAULT_DISPLAY) {}

		// One for the warmup/first desk and one for the second desk.
		verify(mockShellTaskOrganizer, times(2))
		.createRootTask(
		any(),
		eq(organizer)
		)
		verify(mockShellTaskOrganizer, times(2)).createRootTask(any(), eq(organizer))
		}

		@Test
		@@ -1066,12 +1056,7 @@ class RootTaskDesksOrganizerTest : ShellTestCase() {
		this.displayId = displayId
		}
		Mockito.reset(mockShellTaskOrganizer)
		whenever(
		mockShellTaskOrganizer.createRootTask(
		any(),
		eq(organizer)
		)
		)
		whenever(mockShellTaskOrganizer.createRootTask(any(), eq(organizer)))
		.thenAnswer { invocation ->
		val listener = (invocation.arguments[1] as TaskListener)
		listener.onTaskAppeared(freeformRootTask, SurfaceControl())
		@@ -1098,12 +1083,7 @@ class RootTaskDesksOrganizerTest : ShellTestCase() {
		this.displayId = displayId
		}
		Mockito.reset(mockShellTaskOrganizer)
		whenever(
		mockShellTaskOrganizer.createRootTask(
		any(),
		eq(organizer)
		)
		)
		whenever(mockShellTaskOrganizer.createRootTask(any(), eq(organizer)))
		.thenAnswer { invocation ->
		val listener = (invocation.arguments[1] as TaskListener)
		listener.onTaskAppeared(freeformRootTask, SurfaceControl())