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

Commit 3243b4ba authored by Jeff Chang's avatar Jeff Chang
Browse files

Fix split screen test case failure 

5af1f670, change to use isSplitScreenVisible for related logic.
This CL updates the test case with the change together.

Bug: 262544588
Test: atest com.android.wm.shell.splitscreen
Change-Id: I5713effd96d972b31fad963ed1b966a494ff7823
parent bd24d074

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/splitscreen/StageCoordinatorTests.java

+3 −3
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ public class StageCoordinatorTests extends ShellTestCase { 
        final ActivityManager.RunningTaskInfo task = new TestRunningTaskInfoBuilder().build();



        // Verify move to undefined stage while split screen not activated moves task to side stage.

        when(mMainStage.isActive()).thenReturn(false);

        when(mStageCoordinator.isSplitScreenVisible()).thenReturn(false);

        mStageCoordinator.setSideStagePosition(SPLIT_POSITION_TOP_OR_LEFT, null);

        mStageCoordinator.moveToStage(task, STAGE_TYPE_UNDEFINED, SPLIT_POSITION_BOTTOM_OR_RIGHT,

                new WindowContainerTransaction());
@@ -163,7 +163,7 @@ public class StageCoordinatorTests extends ShellTestCase { 
        assertEquals(SPLIT_POSITION_BOTTOM_OR_RIGHT, mStageCoordinator.getSideStagePosition());



        // Verify move to undefined stage after split screen activated moves task based on position.

        when(mMainStage.isActive()).thenReturn(true);

        when(mStageCoordinator.isSplitScreenVisible()).thenReturn(true);

        assertEquals(SPLIT_POSITION_TOP_OR_LEFT, mStageCoordinator.getMainStagePosition());

        mStageCoordinator.moveToStage(task, STAGE_TYPE_UNDEFINED, SPLIT_POSITION_TOP_OR_LEFT,

                new WindowContainerTransaction());
@@ -262,7 +262,7 @@ public class StageCoordinatorTests extends ShellTestCase { 


    @Test

    public void testResolveStartStage_afterSplitActivated_retrievesStagePosition() {

        when(mMainStage.isActive()).thenReturn(true);

        when(mStageCoordinator.isSplitScreenVisible()).thenReturn(true);

        mStageCoordinator.setSideStagePosition(SPLIT_POSITION_TOP_OR_LEFT, null /* wct */);



        mStageCoordinator.resolveStartStage(STAGE_TYPE_UNDEFINED, SPLIT_POSITION_TOP_OR_LEFT,