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

Commit 381baa69 authored by Hongwei Wang's avatar Hongwei Wang
Browse files

Fix UnfoldAnimationControllerTest 

With ag/20738721, the surface's reset iff there is a state change.
Update the UnfoldAnimationControllerTest accordingly and also decouple
it from pinned task.

Bug: 261996076
Test: atest UnfoldAnimationControllerTest
Change-Id: I7de0733315f54c78e504785fb612c946d98ea38c
parent bc2a6556

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/unfold/UnfoldAnimationControllerTest.java

+7 −3
Original line number Diff line number Diff line
@@ -224,16 +224,18 @@ public class UnfoldAnimationControllerTest extends ShellTestCase { 
        mUnfoldAnimationController.onTaskAppeared(taskInfo, mLeash);

        assertThat(mTaskAnimator1.mResetTasks).doesNotContain(taskInfo.taskId);



        mUnfoldAnimationController.onStateChangeStarted();

        mUnfoldAnimationController.onTaskVanished(taskInfo);

        mUnfoldAnimationController.onStateChangeFinished();



        assertThat(mTaskAnimator1.mResetTasks).contains(taskInfo.taskId);

    }



    @Test

    public void testApplicablePinnedTaskDisappeared_doesNotResetSurface() {

        mTaskAnimator1.setTaskMatcher((info) -> info.getWindowingMode() == 2);

    public void testApplicableTaskDisappeared_noStateChange_doesNotResetSurface() {

        mTaskAnimator1.setTaskMatcher((info) -> info.getWindowingMode() == 0);

        RunningTaskInfo taskInfo = new TestRunningTaskInfoBuilder()

                .setWindowingMode(2).build();

                .setWindowingMode(0).build();

        mUnfoldAnimationController.onTaskAppeared(taskInfo, mLeash);

        assertThat(mTaskAnimator1.mResetTasks).doesNotContain(taskInfo.taskId);
@@ -249,7 +251,9 @@ public class UnfoldAnimationControllerTest extends ShellTestCase { 
                .setWindowingMode(0).build();



        mUnfoldAnimationController.onTaskAppeared(taskInfo, mLeash);

        mUnfoldAnimationController.onStateChangeStarted();

        mUnfoldAnimationController.onTaskVanished(taskInfo);

        mUnfoldAnimationController.onStateChangeFinished();



        assertThat(mTaskAnimator1.mResetTasks).doesNotContain(taskInfo.taskId);

    }