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

Commit 4e7c9bbd authored by Tiger Huang's avatar Tiger Huang
Browse files

Wait for the right handler in TaskPositioningControllerTests 

This CL fixes flaky tests in TaskPositioningControllerTests, and also
corrects some inline comments.

Fix: 147268059
Test: TaskPositioningControllerTests
Change-Id: I0c1f5468435068d95176bac52ec94b4b089f8aac
parent d89d8d3d

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

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


        mTarget.finishTaskPositioning();

        // Wait until the looper processes finishTaskPositioning.

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

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



        assertFalse(mTarget.isPositioningLocked());

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


        mTarget.finishTaskPositioning(mWindow.mClient);

        // Wait until the looper processes finishTaskPositioning.

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

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



        assertFalse(mTarget.isPositioningLocked());

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



        mTarget.handleTapOutsideTask(content, 0, 0);

        // Wait until the looper processes finishTaskPositioning.

        // Wait until the looper processes handleTapOutsideTask.

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



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


        mTarget.finishTaskPositioning();

        // Wait until the looper processes finishTaskPositioning.

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

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



        assertFalse(mTarget.isPositioningLocked());

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



        mTarget.handleTapOutsideTask(content, 0, 0);

        // Wait until the looper processes finishTaskPositioning.

        // Wait until the looper processes handleTapOutsideTask.

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



        assertFalse(mTarget.isPositioningLocked());