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

Commit 9255e7c8 authored by Orhan Uysal's avatar Orhan Uysal
Browse files

Shorten test names to be under 100 chars. 

- Replace "flagEnabled" wtih "withFeature"
- Replace "flagDisabled" with "noFeature"
- Replace cases where above two wasn't enough to not use flag status as
  we can see the flag status through the annotation either way.

Bug: 352266521
Test: atest DesktopTasksController
Flag: EXEMPT Refactor
Change-Id: I764b0d18fbc94718e5d9769886f66a8a329b2919
parent ab9561c7

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

+28 −28
Original line number Diff line number Diff line
@@ -1446,7 +1446,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,

    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION,

  )

  fun handleRequest_backTransition_singleActiveTaskNoToken_wallpaperDisabled_backNavDisabled_doesNotHandle() {

  fun handleRequest_backTransition_singleTaskNoToken_noWallpaper_noBackNav_doesNotHandle() {

    val task = setUpFreeformTask()



    val result = controller.handleRequest(Binder(), createTransition(task, type = TRANSIT_TO_BACK))
@@ -1459,7 +1459,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,

    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION

  )

  fun handleRequest_backTransition_singleActiveTaskNoToken_wallpaperEnabled_backNavEnabled_removesTask() {

  fun handleRequest_backTransition_singleTaskNoToken_withWallpaper_withBackNav_removesTask() {

    val task = setUpFreeformTask()



    val result = controller.handleRequest(Binder(), createTransition(task, type = TRANSIT_TO_BACK))
@@ -1470,7 +1470,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
  @Test

  @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)

  @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION)

  fun handleRequest_backTransition_singleActiveTaskNoToken_backNavigationDisabled_doesNotHandle() {

  fun handleRequest_backTransition_singleTaskNoToken_noBackNav_doesNotHandle() {

    val task = setUpFreeformTask()



    val result = controller.handleRequest(Binder(), createTransition(task, type = TRANSIT_TO_BACK))
@@ -1483,7 +1483,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,

    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION

  )

  fun handleRequest_backTransition_singleActiveTaskWithToken_wallpaperDisabled_backNavDisabled_doesNotHandle() {

  fun handleRequest_backTransition_singleTaskWithToken_noWallpaper_noBackNav_doesNotHandle() {

    val task = setUpFreeformTask()



    desktopModeTaskRepository.wallpaperActivityToken = MockToken().token()
@@ -1497,7 +1497,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,

    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION

  )

  fun handleRequest_backTransition_singleActiveTaskWithToken_wallpaperEnabled_backNavEnabled_removesWallpaperAndTask() {

  fun handleRequest_backTransition_singleTask_withWallpaper_withBackNav_removesWallpaperAndTask() {

    val task = setUpFreeformTask()

    val wallpaperToken = MockToken().token()
@@ -1512,7 +1512,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
  @Test

  @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)

  @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION)

  fun handleRequest_backTransition_singleActiveTaskWithToken_backNavigationDisabled_removesWallpaper() {

  fun handleRequest_backTransition_singleTaskWithToken_noBackNav_removesWallpaper() {

    val task = setUpFreeformTask()

    val wallpaperToken = MockToken().token()
@@ -1528,7 +1528,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,

    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION

  )

  fun handleRequest_backTransition_multipleTasks_wallpaperDisabled_backNavDisabled_doesNotHandle() {

  fun handleRequest_backTransition_multipleTasks_noWallpaper_noBackNav_doesNotHandle() {

    val task1 = setUpFreeformTask()

    setUpFreeformTask()
@@ -1543,7 +1543,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,

    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION

  )

  fun handleRequest_backTransition_multipleTasks_wallpaperEnabled_backNavEnabled_removesTask() {

  fun handleRequest_backTransition_multipleTasks_withWallpaper_withBackNav_removesTask() {

    val task1 = setUpFreeformTask()

    setUpFreeformTask()
@@ -1556,7 +1556,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
  @Test

  @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)

  @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION)

  fun handleRequest_backTransition_multipleTasks_backNavigationDisabled_doesNotHandle() {

  fun handleRequest_backTransition_multipleTasks_noBackNav_doesNotHandle() {

    val task1 = setUpFreeformTask()

    setUpFreeformTask()
@@ -1571,7 +1571,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,

    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION

  )

  fun handleRequest_backTransition_multipleTasksSingleNonClosing_wallpaperEnabled_backNavEnabled_removesWallpaperAndTask() {

  fun handleRequest_backTransition_multipleTasksSingleNonClosing_removesWallpaperAndTask() {

    val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)

    val task2 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)

    val wallpaperToken = MockToken().token()
@@ -1588,7 +1588,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
  @Test

  @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)

  @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION)

  fun handleRequest_backTransition_multipleTasksSingleNonClosing_backNavigationDisabled_removesWallpaper() {

  fun handleRequest_backTransition_multipleTasksSingleNonClosing_noBackNav_removesWallpaper() {

    val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)

    val task2 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)

    val wallpaperToken = MockToken().token()
@@ -1606,7 +1606,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,

    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION

  )

  fun handleRequest_backTransition_multipleTasksSingleNonMinimized_wallpaperEnabled_backNavEnabled_removesWallpaperAndTask() {

  fun handleRequest_backTransition_multipleTasksSingleNonMinimized_removesWallpaperAndTask() {

    val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)

    val task2 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)

    val wallpaperToken = MockToken().token()
@@ -1623,7 +1623,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
  @Test

  @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)

  @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION)

  fun handleRequest_backTransition_multipleTasksSingleNonMinimized_backNavigationDisabled_removesWallpaper() {

  fun handleRequest_backTransition_multipleTasksSingleNonMinimized_noBackNav_removesWallpaper() {

    val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)

    val task2 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)

    val wallpaperToken = MockToken().token()
@@ -1641,7 +1641,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,

    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION

  )

  fun handleRequest_backTransition_nonMinimizadTask_wallpaperEnabled_backNavEnabled_removesWallpaper() {

  fun handleRequest_backTransition_nonMinimizadTask_withWallpaper_withBackNav_removesWallpaper() {

    val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)

    val task2 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)

    val wallpaperToken = MockToken().token()
@@ -1661,7 +1661,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,

    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION

  )

  fun handleRequest_closeTransition_singleActiveTaskNoToken_wallpaperDisabled_backNavDisabled_doesNotHandle() {

  fun handleRequest_closeTransition_singleTaskNoToken_noWallpaper_noBackNav_doesNotHandle() {

    val task = setUpFreeformTask()



    val result = controller.handleRequest(Binder(), createTransition(task, type = TRANSIT_CLOSE))
@@ -1674,7 +1674,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,

    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION

  )

  fun handleRequest_closeTransition_singleActiveTaskNoToken_wallpaperEnabled_backNavEnabled_removesTask() {

  fun handleRequest_closeTransition_singleTaskNoToken_withWallpaper_withBackNav_removesTask() {

    val task = setUpFreeformTask()



    val result = controller.handleRequest(Binder(), createTransition(task, type = TRANSIT_CLOSE))
@@ -1685,7 +1685,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
  @Test

  @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)

  @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION)

  fun handleRequest_closeTransition_singleActiveTaskNoToken_backNavigationDisabled_doesNotHandle() {

  fun handleRequest_closeTransition_singleTaskNoToken_noBackNav_doesNotHandle() {

    val task = setUpFreeformTask()



    val result = controller.handleRequest(Binder(), createTransition(task, type = TRANSIT_CLOSE))
@@ -1698,7 +1698,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,

    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION

  )

  fun handleRequest_closeTransition_singleActiveTaskWithToken_wallpaperDisabled_backNavDisabled_doesNotHandle() {

  fun handleRequest_closeTransition_singleTaskWithToken_noWallpaper_noBackNav_doesNotHandle() {

    val task = setUpFreeformTask()



    desktopModeTaskRepository.wallpaperActivityToken = MockToken().token()
@@ -1712,7 +1712,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,

    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION

  )

  fun handleRequest_closeTransition_singleActiveTaskWithToken_wallpaperEnabled_backNavEnabled_removesWallpaperAndTask() {

  fun handleRequest_closeTransition_singleTaskWithToken_removesWallpaperAndTask() {

    val task = setUpFreeformTask()

    val wallpaperToken = MockToken().token()
@@ -1727,7 +1727,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
  @Test

  @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)

  @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION)

  fun handleRequest_closeTransition_singleActiveTaskWithToken_backNavigationDisabled_removesWallpaper() {

  fun handleRequest_closeTransition_singleTaskWithToken_withWallpaper_noBackNav_removesWallpaper() {

    val task = setUpFreeformTask()

    val wallpaperToken = MockToken().token()
@@ -1743,7 +1743,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,

    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION

  )

  fun handleRequest_closeTransition_multipleTasks_wallpaperDisabled_backNavDisabled_doesNotHandle() {

  fun handleRequest_closeTransition_multipleTasks_noWallpaper_noBackNav_doesNotHandle() {

    val task1 = setUpFreeformTask()

    setUpFreeformTask()
@@ -1758,7 +1758,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,

    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION

  )

  fun handleRequest_closeTransition_multipleTasks_wallpaperEnabled_backNavEnabled_removesTask() {

  fun handleRequest_closeTransition_multipleTasks_withWallpaper_withBackNav_removesTask() {

    val task1 = setUpFreeformTask()

    setUpFreeformTask()
@@ -1772,7 +1772,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
  @Test

  @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)

  @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION)

  fun handleRequest_closeTransition_multipleTasksFlagEnabled_backNavigationDisabled_doesNotHandle() {

  fun handleRequest_closeTransition_multipleTasksFlagEnabled_noBackNav_doesNotHandle() {

    val task1 = setUpFreeformTask()

    setUpFreeformTask()
@@ -1787,7 +1787,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,

    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION

  )

  fun handleRequest_closeTransition_multipleTasksSingleNonClosing_wallpaperEnabled_backNavEnabled_removesWallpaperAndTask() {

  fun handleRequest_closeTransition_multipleTasksSingleNonClosing_removesWallpaperAndTask() {

    val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)

    val task2 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)

    val wallpaperToken = MockToken().token()
@@ -1804,7 +1804,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
  @Test

  @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)

  @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION)

  fun handleRequest_closeTransition_multipleTasksSingleNonClosing_backNavigationDisabled_removesWallpaper() {

  fun handleRequest_closeTransition_multipleTasksSingleNonClosing_noBackNav_removesWallpaper() {

    val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)

    val task2 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)

    val wallpaperToken = MockToken().token()
@@ -1822,7 +1822,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,

    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION

  )

  fun handleRequest_closeTransition_multipleTasksOneNonMinimized_wallpaperEnabled_backNavEnabled_removesWallpaperAndTask() {

  fun handleRequest_closeTransition_multipleTasksOneNonMinimized_removesWallpaperAndTask() {

    val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)

    val task2 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)

    val wallpaperToken = MockToken().token()
@@ -1839,7 +1839,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
  @Test

  @EnableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY)

  @DisableFlags(Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION)

  fun handleRequest_closeTransition_multipleTasksSingleNonMinimized_backNavigationDisabled_removesWallpaper() {

  fun handleRequest_closeTransition_multipleTasksSingleNonMinimized_noBackNav_removesWallpaper() {

    val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)

    val task2 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)

    val wallpaperToken = MockToken().token()
@@ -1857,7 +1857,7 @@ class DesktopTasksControllerTest : ShellTestCase() { 
    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,

    Flags.FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION

  )

  fun handleRequest_closeTransition_minimizadTask_wallpaperEnabled_backNavEnabled_removesWallpaper() {

  fun handleRequest_closeTransition_minimizadTask_withWallpaper_withBackNav_removesWallpaper() {

    val task1 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)

    val task2 = setUpFreeformTask(displayId = DEFAULT_DISPLAY)

    val wallpaperToken = MockToken().token()