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

Commit c7b8a545 authored by Chilun's avatar Chilun
Browse files

Rename Stack to Task related terms in tests 

Rename Stack to Task and unify some methods to make them clearer and
simpler.

Bug: 144248496
Test: atest AppTransitionControllerTest AppTransitionTests
      atest DisplayContentTests DragDropControllerTests
      atest RecentsAnimationControllerTest RootTaskTests
      atest TaskDisplayAreaTests TaskLaunchParamsModifierTests
      atest TaskTests TransitionTests WindowContainerTests
      atest WindowManagerServiceTests WindowOrganizerTests WindowStateTests
Change-Id: Ifc7e4d86f3b19dc55a25293d65ae53856e93bf4d
parent 58b2237f

services/tests/wmtests/src/com/android/server/wm/AppTransitionControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ public class AppTransitionControllerTest extends WindowTestsBase { 
    public void testGetAnimationTargets_taskContainsMultipleTasks() {

        // [DisplayContent] - [Task] -+- [Task1] - [ActivityRecord1] (opening, invisible)

        //                            +- [Task2] - [ActivityRecord2] (closing, visible)

        final Task parentTask = createTaskStackOnDisplay(mDisplayContent);

        final Task parentTask = createTask(mDisplayContent);

        final ActivityRecord activity1 = createActivityRecordWithParentTask(parentTask);

        activity1.setVisible(false);

        activity1.mVisibleRequested = true;

services/tests/wmtests/src/com/android/server/wm/AppTransitionTests.java

+5 −5
Original line number Diff line number Diff line
@@ -177,13 +177,13 @@ public class AppTransitionTests extends WindowTestsBase { 
    }



    @Test

    public void testCleanAppTransitionWhenTaskStackReparent() {

    public void testCleanAppTransitionWhenRootTaskReparent() {

        // Create 2 displays & presume both display the state is ON for ready to display & animate.

        final DisplayContent dc1 = createNewDisplay(Display.STATE_ON);

        final DisplayContent dc2 = createNewDisplay(Display.STATE_ON);



        final Task stack1 = createTaskStackOnDisplay(dc1);

        final Task task1 = createTaskInStack(stack1, 0 /* userId */);

        final Task rootTask1 = createTask(dc1);

        final Task task1 = createTaskInRootTask(rootTask1, 0 /* userId */);

        final ActivityRecord activity1 = createNonAttachedActivityRecord(dc1);

        task1.addChild(activity1, 0);
@@ -198,8 +198,8 @@ public class AppTransitionTests extends WindowTestsBase { 
        dc1.mOpeningApps.add(activity1);

        assertTrue(dc1.mOpeningApps.size() > 0);



        // Move stack to another display.

        stack1.reparent(dc2.getDefaultTaskDisplayArea(), true);

        // Move root task to another display.

        rootTask1.reparent(dc2.getDefaultTaskDisplayArea(), true);



        // Verify if token are cleared from both pending transition list in former display.

        assertFalse(dc1.mOpeningApps.contains(activity1));

services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java

+14 −14
Original line number Diff line number Diff line
@@ -376,11 +376,11 @@ public class DisplayContentTests extends WindowTestsBase { 
        final DisplayContent dc = createNewDisplay();



        // Add root task with activity.

        final Task rootTask = createTaskStackOnDisplay(dc);

        final Task rootTask = createTask(dc);

        assertEquals(dc.getDisplayId(), rootTask.getDisplayContent().getDisplayId());

        assertEquals(dc, rootTask.getDisplayContent());



        final Task task = createTaskInStack(rootTask, 0 /* userId */);

        final Task task = createTaskInRootTask(rootTask, 0 /* userId */);

        final ActivityRecord activity = createNonAttachedActivityRecord(dc);

        task.addChild(activity, 0);

        assertEquals(dc, task.getDisplayContent());
@@ -450,15 +450,15 @@ public class DisplayContentTests extends WindowTestsBase { 
        final DisplayContent dc1 = createNewDisplay();



        // Add root task with activity.

        final Task rootTask0 = createTaskStackOnDisplay(dc0);

        final Task task0 = createTaskInStack(rootTask0, 0 /* userId */);

        final Task rootTask0 = createTask(dc0);

        final Task task0 = createTaskInRootTask(rootTask0, 0 /* userId */);

        final ActivityRecord activity = createNonAttachedActivityRecord(dc0);

        task0.addChild(activity, 0);

        dc0.configureDisplayPolicy();

        assertNotNull(dc0.mTapDetector);



        final Task rootTask1 = createTaskStackOnDisplay(dc1);

        final Task task1 = createTaskInStack(rootTask1, 0 /* userId */);

        final Task rootTask1 = createTask(dc1);

        final Task task1 = createTaskInRootTask(rootTask1, 0 /* userId */);

        final ActivityRecord activity1 = createNonAttachedActivityRecord(dc0);

        task1.addChild(activity1, 0);

        dc1.configureDisplayPolicy();
@@ -1681,8 +1681,8 @@ public class DisplayContentTests extends WindowTestsBase { 
    @Test

    public void testFindScrollCaptureTargetWindow_behindWindow() {

        DisplayContent display = createNewDisplay();

        Task rootTask = createTaskStackOnDisplay(display);

        Task task = createTaskInStack(rootTask, 0 /* userId */);

        Task rootTask = createTask(display);

        Task task = createTaskInRootTask(rootTask, 0 /* userId */);

        WindowState activityWindow = createAppWindow(task, TYPE_APPLICATION, "App Window");

        WindowState behindWindow = createWindow(null, TYPE_SCREENSHOT, display, "Screenshot");
@@ -1694,8 +1694,8 @@ public class DisplayContentTests extends WindowTestsBase { 
    @Test

    public void testFindScrollCaptureTargetWindow_cantReceiveKeys() {

        DisplayContent display = createNewDisplay();

        Task rootTask = createTaskStackOnDisplay(display);

        Task task = createTaskInStack(rootTask, 0 /* userId */);

        Task rootTask = createTask(display);

        Task task = createTaskInRootTask(rootTask, 0 /* userId */);

        WindowState activityWindow = createAppWindow(task, TYPE_APPLICATION, "App Window");

        WindowState invisible = createWindow(null, TYPE_APPLICATION, "invisible");

        invisible.mViewVisibility = View.INVISIBLE;  // make canReceiveKeys return false
@@ -1708,8 +1708,8 @@ public class DisplayContentTests extends WindowTestsBase { 
    @Test

    public void testFindScrollCaptureTargetWindow_taskId() {

        DisplayContent display = createNewDisplay();

        Task rootTask = createTaskStackOnDisplay(display);

        Task task = createTaskInStack(rootTask, 0 /* userId */);

        Task rootTask = createTask(display);

        Task task = createTaskInRootTask(rootTask, 0 /* userId */);

        WindowState window = createAppWindow(task, TYPE_APPLICATION, "App Window");

        WindowState behindWindow = createWindow(null, TYPE_SCREENSHOT, display, "Screenshot");
@@ -1720,8 +1720,8 @@ public class DisplayContentTests extends WindowTestsBase { 
    @Test

    public void testFindScrollCaptureTargetWindow_taskIdCantReceiveKeys() {

        DisplayContent display = createNewDisplay();

        Task rootTask = createTaskStackOnDisplay(display);

        Task task = createTaskInStack(rootTask, 0 /* userId */);

        Task rootTask = createTask(display);

        Task task = createTaskInRootTask(rootTask, 0 /* userId */);

        WindowState window = createAppWindow(task, TYPE_APPLICATION, "App Window");

        window.mViewVisibility = View.INVISIBLE;  // make canReceiveKeys return false

        WindowState behindWindow = createWindow(null, TYPE_SCREENSHOT, display, "Screenshot");

services/tests/wmtests/src/com/android/server/wm/DragDropControllerTests.java

+2 −5
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
package com.android.server.wm;



import static android.Manifest.permission.START_TASKS_FROM_RECENTS;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.content.ClipDescription.MIMETYPE_APPLICATION_ACTIVITY;

import static android.content.ClipDescription.MIMETYPE_APPLICATION_SHORTCUT;

import static android.content.ClipDescription.MIMETYPE_APPLICATION_TASK;
@@ -124,9 +122,8 @@ public class DragDropControllerTests extends WindowTestsBase { 
     */

    private WindowState createDropTargetWindow(String name, int ownerId) {

        final ActivityRecord activity = createNonAttachedActivityRecord(mDisplayContent);

        final Task stack = createTaskStackOnDisplay(

                WINDOWING_MODE_FULLSCREEN, ACTIVITY_TYPE_STANDARD, mDisplayContent);

        final Task task = createTaskInStack(stack, ownerId);

        final Task rootTask = createTask(mDisplayContent);

        final Task task = createTaskInRootTask(rootTask, ownerId);

        task.addChild(activity, 0);



        // Use a new TestIWindow so we don't collect events for other windows

services/tests/wmtests/src/com/android/server/wm/RecentsAnimationControllerTest.java

+3 −3
Original line number Diff line number Diff line
@@ -488,9 +488,9 @@ public class RecentsAnimationControllerTest extends WindowTestsBase { 
    @Test

    public void testIsAnimatingByRecents() {

        final ActivityRecord homeActivity = createHomeActivity();

        final Task rootTask = createTaskStackOnDisplay(mDefaultDisplay);

        final Task childTask = createTaskInStack(rootTask, 0 /* userId */);

        final Task leafTask = createTaskInStack(childTask, 0 /* userId */);

        final Task rootTask = createTask(mDefaultDisplay);

        final Task childTask = createTaskInRootTask(rootTask, 0 /* userId */);

        final Task leafTask = createTaskInRootTask(childTask, 0 /* userId */);

        spyOn(leafTask);

        doReturn(true).when(leafTask).isVisible();