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

Commit e611e8c4 authored by Tiger Huang's avatar Tiger Huang Committed by Android (Google) Code Review
Browse files

Merge "Wait for the right handler in TaskPositioningControllerTests"

parents b8bf014c 4e7c9bbd

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

+5 −5
Original line number Original line Diff line number Diff line
@@ -84,7 +84,7 @@ public class TaskPositioningControllerTests extends WindowTestsBase { 




        mTarget.finishTaskPositioning();

        mTarget.finishTaskPositioning();

        // Wait until the looper processes finishTaskPositioning.

        // Wait until the looper processes finishTaskPositioning.

        assertTrue(waitHandlerIdle(mWm.mH, TIMEOUT_MS));

        assertTrue(waitHandlerIdle(mWm.mAnimationHandler, TIMEOUT_MS));





        assertFalse(mTarget.isPositioningLocked());

        assertFalse(mTarget.isPositioningLocked());

        assertNull(mTarget.getDragWindowHandleLocked());

        assertNull(mTarget.getDragWindowHandleLocked());
@@ -103,7 +103,7 @@ public class TaskPositioningControllerTests extends WindowTestsBase { 




        mTarget.finishTaskPositioning(mWindow.mClient);

        mTarget.finishTaskPositioning(mWindow.mClient);

        // Wait until the looper processes finishTaskPositioning.

        // Wait until the looper processes finishTaskPositioning.

        assertTrue(waitHandlerIdle(mWm.mH, TIMEOUT_MS));

        assertTrue(waitHandlerIdle(mWm.mAnimationHandler, TIMEOUT_MS));





        assertFalse(mTarget.isPositioningLocked());

        assertFalse(mTarget.isPositioningLocked());

        assertNull(mTarget.getDragWindowHandleLocked());

        assertNull(mTarget.getDragWindowHandleLocked());
@@ -119,7 +119,7 @@ public class TaskPositioningControllerTests extends WindowTestsBase { 
        assertNotNull(mWindow.getTask().getTopVisibleAppMainWindow());

        assertNotNull(mWindow.getTask().getTopVisibleAppMainWindow());





        mTarget.handleTapOutsideTask(content, 0, 0);

        mTarget.handleTapOutsideTask(content, 0, 0);

        // Wait until the looper processes finishTaskPositioning.

        // Wait until the looper processes handleTapOutsideTask.

        assertTrue(waitHandlerIdle(mWm.mH, TIMEOUT_MS));

        assertTrue(waitHandlerIdle(mWm.mH, TIMEOUT_MS));





        assertTrue(mTarget.isPositioningLocked());

        assertTrue(mTarget.isPositioningLocked());
@@ -127,7 +127,7 @@ public class TaskPositioningControllerTests extends WindowTestsBase { 




        mTarget.finishTaskPositioning();

        mTarget.finishTaskPositioning();

        // Wait until the looper processes finishTaskPositioning.

        // Wait until the looper processes finishTaskPositioning.

        assertTrue(waitHandlerIdle(mWm.mH, TIMEOUT_MS));

        assertTrue(waitHandlerIdle(mWm.mAnimationHandler, TIMEOUT_MS));





        assertFalse(mTarget.isPositioningLocked());

        assertFalse(mTarget.isPositioningLocked());

        assertNull(mTarget.getDragWindowHandleLocked());

        assertNull(mTarget.getDragWindowHandleLocked());
@@ -145,7 +145,7 @@ public class TaskPositioningControllerTests extends WindowTestsBase { 
        mWindow.getTask().setResizeMode(RESIZE_MODE_UNRESIZEABLE);

        mWindow.getTask().setResizeMode(RESIZE_MODE_UNRESIZEABLE);





        mTarget.handleTapOutsideTask(content, 0, 0);

        mTarget.handleTapOutsideTask(content, 0, 0);

        // Wait until the looper processes finishTaskPositioning.

        // Wait until the looper processes handleTapOutsideTask.

        assertTrue(waitHandlerIdle(mWm.mH, TIMEOUT_MS));

        assertTrue(waitHandlerIdle(mWm.mH, TIMEOUT_MS));





        assertFalse(mTarget.isPositioningLocked());

        assertFalse(mTarget.isPositioningLocked());