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

Commit 8af0860b authored by Jeff Chang's avatar Jeff Chang Committed by Android (Google) Code Review
Browse files

Merge "Fix split screen test case failure" into tm-qpr-dev

parents 52f08d1e 3243b4ba

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,