Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 057015f7 authored Nov 20, 2024 by Pierre Barbier de Reuille

Refactor DesktopTestHelpers

Instead of an empty class with a companion object, DesktopTestHelpers
should be simple an object. Furthermore, there is no point is generating
extra java methods that are not used. The overloads may be added later
if those methods are needed in a Java context.

Test: N/A
Flag: EXEMPT (refactoring)
Change-Id: If3c1e65afd2f4349a97b8ed9d8a9732a606373d3

parent 70c1afa3

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@ import android.testing.AndroidTestingRunner
		import androidx.test.filters.SmallTest
		import com.android.internal.R
		import com.android.wm.shell.ShellTestCase
		import com.android.wm.shell.desktopmode.DesktopTestHelpers.Companion.createFreeformTask
		import com.android.wm.shell.desktopmode.DesktopTestHelpers.createFreeformTask
		import org.junit.Assert.assertFalse
		import org.junit.Assert.assertTrue
		import org.junit.Test

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -39,8 +39,8 @@ import com.android.wm.shell.ShellTaskOrganizer
		import com.android.wm.shell.ShellTestCase
		import com.android.wm.shell.common.ShellExecutor
		import com.android.wm.shell.common.TaskStackListenerImpl
		import com.android.wm.shell.desktopmode.DesktopTestHelpers.Companion.createFreeformTask
		import com.android.wm.shell.desktopmode.DesktopTestHelpers.Companion.createFullscreenTask
		import com.android.wm.shell.desktopmode.DesktopTestHelpers.createFreeformTask
		import com.android.wm.shell.desktopmode.DesktopTestHelpers.createFullscreenTask
		import com.android.wm.shell.desktopmode.persistence.Desktop
		import com.android.wm.shell.desktopmode.persistence.DesktopPersistentRepository
		import com.android.wm.shell.desktopmode.persistence.DesktopRepositoryInitializer

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ import com.android.wm.shell.TestShellExecutor
		import com.android.wm.shell.common.DisplayController
		import com.android.wm.shell.common.DisplayLayout
		import com.android.wm.shell.desktopmode.DesktopImmersiveController.ExitReason.USER_INTERACTION
		import com.android.wm.shell.desktopmode.DesktopTestHelpers.Companion.createFreeformTask
		import com.android.wm.shell.desktopmode.DesktopTestHelpers.createFreeformTask
		import com.android.wm.shell.sysui.ShellInit
		import com.android.wm.shell.transition.Transitions
		import com.android.wm.shell.util.StubTransaction

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ import com.android.wm.shell.MockToken
		import com.android.wm.shell.RootTaskDisplayAreaOrganizer
		import com.android.wm.shell.ShellTaskOrganizer
		import com.android.wm.shell.ShellTestCase
		import com.android.wm.shell.desktopmode.DesktopTestHelpers.Companion.createFreeformTask
		import com.android.wm.shell.desktopmode.DesktopTestHelpers.createFreeformTask
		import com.android.wm.shell.transition.FocusTransitionObserver
		import com.google.common.truth.Truth.assertThat
		import kotlinx.coroutines.ExperimentalCoroutinesApi

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -23,8 +23,8 @@ import android.testing.AndroidTestingRunner
		import androidx.test.filters.SmallTest
		import com.android.window.flags.Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION
		import com.android.wm.shell.ShellTestCase
		import com.android.wm.shell.desktopmode.DesktopTestHelpers.Companion.createFreeformTask
		import com.android.wm.shell.desktopmode.DesktopTestHelpers.Companion.createFullscreenTask
		import com.android.wm.shell.desktopmode.DesktopTestHelpers.createFreeformTask
		import com.android.wm.shell.desktopmode.DesktopTestHelpers.createFullscreenTask
		import org.junit.Before
		import org.junit.Rule
		import org.junit.Test