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

Commit 5f40f9ea authored by Orhan Uysal's avatar Orhan Uysal
Browse files

Create RecentTasks test for z-order. 

Introduce new test to make sure that recent tasks are added to the list
considering their z-order.

Test: atest WmTests:RecentTasksTest
Bug: 317488684
Change-Id: I3c6987e0ad17a29eb62e35ae42bee10fa3fac020
parent 5e33a738

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

+24 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.server.wm; 
import static android.app.ActivityManager.RECENT_WITH_EXCLUDED;

import static android.app.ActivityManager.RECENT_WITH_EXCLUDED;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;

import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;

import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;

import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;

import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;

import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
@@ -1206,6 +1207,29 @@ public class RecentTasksTest extends WindowTestsBase { 
        verifyZeroInteractions(controller);

        verifyZeroInteractions(controller);

    }

    }





    @Test

    public void addTask_tasksAreAddedAccordingToZOrder() {

        final Task firstTask = new TaskBuilder(mSupervisor).setTaskId(1)

                .setWindowingMode(WINDOWING_MODE_FREEFORM).build();

        final Task secondTask = new TaskBuilder(mSupervisor).setTaskId(2)

                .setWindowingMode(WINDOWING_MODE_FREEFORM).build();



        assertEquals(-1, firstTask.compareTo(secondTask));



        // initial addition when tasks are created

        mRecentTasks.add(firstTask);

        mRecentTasks.add(secondTask);



        assertRecentTasksOrder(secondTask, firstTask);



        // Tasks are added in a different order

        mRecentTasks.add(secondTask);

        mRecentTasks.add(firstTask);



        // order in recents don't change as first task has lower z-order

        assertRecentTasksOrder(secondTask, firstTask);

    }



    @Test

    @Test

    public void removeTask_callsTaskNotificationController() {

    public void removeTask_callsTaskNotificationController() {

        final Task task = createTaskBuilder(".Task").build();

        final Task task = createTaskBuilder(".Task").build();