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

Commit 2e529466 authored by Nergi Rahardi's avatar Nergi Rahardi Committed by Android (Google) Code Review
Browse files

Merge changes Id4b6471a,I5543cfcf into main 

* changes:
  Refactor WindowStateTests to use newWindowBuilder
  Refactor more various tests to use newWindowBuilder
parents 0a98ece7 2a80f2a6

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

+2 −2
Original line number Diff line number Diff line
@@ -342,8 +342,8 @@ public class AppTransitionTests extends WindowTestsBase { 
    public void testCancelRemoteAnimationWhenFreeze() {

        final DisplayContent dc = createNewDisplay(Display.STATE_ON);

        doReturn(false).when(dc).onDescendantOrientationChanged(any());

        final WindowState exitingAppWindow = createWindow(null /* parent */, TYPE_BASE_APPLICATION,

                dc, "exiting app");

        final WindowState exitingAppWindow = newWindowBuilder("exiting app",

                TYPE_BASE_APPLICATION).setDisplay(dc).build();

        final ActivityRecord exitingActivity = exitingAppWindow.mActivityRecord;

        // Wait until everything in animation handler get executed to prevent the exiting window

        // from being removed during WindowSurfacePlacer Traversal.

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

+4 −4
Original line number Diff line number Diff line
@@ -266,10 +266,10 @@ public class DisplayContentDeferredUpdateTests extends WindowTestsBase { 
        mSetFlagsRule.enableFlags(Flags.FLAG_WAIT_FOR_TRANSITION_ON_DISPLAY_SWITCH);

        prepareSecondaryDisplay();



        final WindowState defaultDisplayWindow = createWindow(/* parent= */ null,

                TYPE_BASE_APPLICATION, mDisplayContent, "DefaultDisplayWindow");

        final WindowState secondaryDisplayWindow = createWindow(/* parent= */ null,

                TYPE_BASE_APPLICATION, mSecondaryDisplayContent, "SecondaryDisplayWindow");

        final WindowState defaultDisplayWindow = newWindowBuilder("DefaultDisplayWindow",

                TYPE_BASE_APPLICATION).setDisplay(mDisplayContent).build();

        final WindowState secondaryDisplayWindow = newWindowBuilder("SecondaryDisplayWindow",

                TYPE_BASE_APPLICATION).setDisplay(mSecondaryDisplayContent).build();

        makeWindowVisibleAndNotDrawn(defaultDisplayWindow, secondaryDisplayWindow);



        // Mark as display switching only for the default display as we filter out

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

+14 −20
Original line number Diff line number Diff line
@@ -379,13 +379,11 @@ public class DualDisplayAreaGroupPolicyTest extends WindowTestsBase { 
        assertThat(imeContainer.getRootDisplayArea()).isEqualTo(mDisplay);

        assertThat(mDisplay.findAreaForTokenInLayer(imeToken)).isEqualTo(imeContainer);



        final WindowState firstActivityWin =

                createWindow(null /* parent */, TYPE_APPLICATION_STARTING, mFirstActivity,

                        "firstActivityWin");

        final WindowState firstActivityWin = newWindowBuilder("firstActivityWin",

                TYPE_APPLICATION_STARTING).setWindowToken(mFirstActivity).build();

        spyOn(firstActivityWin);

        final WindowState secondActivityWin =

                createWindow(null /* parent */, TYPE_APPLICATION_STARTING, mSecondActivity,

                        "firstActivityWin");

        final WindowState secondActivityWin = newWindowBuilder("secondActivityWin",

                TYPE_APPLICATION_STARTING).setWindowToken(mSecondActivity).build();

        spyOn(secondActivityWin);



        // firstActivityWin should be the target
@@ -424,13 +422,11 @@ public class DualDisplayAreaGroupPolicyTest extends WindowTestsBase { 
        setupImeWindow();

        final DisplayArea.Tokens imeContainer = mDisplay.getImeContainer();

        final WindowToken imeToken = tokenOfType(TYPE_INPUT_METHOD);

        final WindowState firstActivityWin =

                createWindow(null /* parent */, TYPE_APPLICATION_STARTING, mFirstActivity,

                        "firstActivityWin");

        final WindowState firstActivityWin = newWindowBuilder("firstActivityWin",

                TYPE_APPLICATION_STARTING).setWindowToken(mFirstActivity).build();

        spyOn(firstActivityWin);

        final WindowState secondActivityWin =

                createWindow(null /* parent */, TYPE_APPLICATION_STARTING, mSecondActivity,

                        "secondActivityWin");

        final WindowState secondActivityWin = newWindowBuilder("secondActivityWin",

                TYPE_APPLICATION_STARTING).setWindowToken(mSecondActivity).build();

        spyOn(secondActivityWin);



        // firstActivityWin should be the target
@@ -464,9 +460,8 @@ public class DualDisplayAreaGroupPolicyTest extends WindowTestsBase { 
        assertThat(imeContainer.getRootDisplayArea()).isEqualTo(mDisplay);

        assertThat(mDisplay.findAreaForTokenInLayer(imeToken)).isEqualTo(imeContainer);



        final WindowState firstActivityWin =

                createWindow(null /* parent */, TYPE_APPLICATION_STARTING, mFirstActivity,

                        "firstActivityWin");

        final WindowState firstActivityWin = newWindowBuilder("firstActivityWin",

                TYPE_APPLICATION_STARTING).setWindowToken(mFirstActivity).build();

        spyOn(firstActivityWin);

        // firstActivityWin should be the target

        doReturn(true).when(firstActivityWin).canBeImeTarget();
@@ -499,9 +494,8 @@ public class DualDisplayAreaGroupPolicyTest extends WindowTestsBase { 
        assertThat(imeContainer.getRootDisplayArea()).isEqualTo(mDisplay);



        // firstActivityWin should be the target

        final WindowState firstActivityWin =

                createWindow(null /* parent */, TYPE_APPLICATION_STARTING, mFirstActivity,

                        "firstActivityWin");

        final WindowState firstActivityWin = newWindowBuilder("firstActivityWin",

                TYPE_APPLICATION_STARTING).setWindowToken(mFirstActivity).build();

        spyOn(firstActivityWin);

        doReturn(true).when(firstActivityWin).canBeImeTarget();

        WindowState imeTarget = mDisplay.computeImeTarget(true /* updateImeTarget */);
@@ -560,8 +554,8 @@ public class DualDisplayAreaGroupPolicyTest extends WindowTestsBase { 
    }



    private void setupImeWindow() {

        final WindowState imeWindow = createWindow(null /* parent */,

                TYPE_INPUT_METHOD, mDisplay, "mImeWindow");

        final WindowState imeWindow = newWindowBuilder("mImeWindow", TYPE_INPUT_METHOD).setDisplay(

                mDisplay).build();

        imeWindow.mAttrs.flags |= FLAG_NOT_FOCUSABLE;

        mDisplay.mInputMethodWindow = imeWindow;

    }

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

+6 −4
Original line number Diff line number Diff line
@@ -878,8 +878,10 @@ public class TaskFragmentTest extends WindowTestsBase { 
                .build();

        final ActivityRecord activity0 = tf0.getTopMostActivity();

        final ActivityRecord activity1 = tf1.getTopMostActivity();

        final WindowState win0 = createWindow(null, TYPE_BASE_APPLICATION, activity0, "win0");

        final WindowState win1 = createWindow(null, TYPE_BASE_APPLICATION, activity1, "win1");

        final WindowState win0 = newWindowBuilder("win0", TYPE_BASE_APPLICATION).setWindowToken(

                activity0).build();

        final WindowState win1 = newWindowBuilder("win1", TYPE_BASE_APPLICATION).setWindowToken(

                activity1).build();

        doReturn(false).when(mDisplayContent).shouldImeAttachedToApp();



        mDisplayContent.setImeInputTarget(win0);
@@ -1174,8 +1176,8 @@ public class TaskFragmentTest extends WindowTestsBase { 
    }



    private WindowState createAppWindow(ActivityRecord app, String name) {

        final WindowState win = createWindow(null, TYPE_BASE_APPLICATION, app, name,

                0 /* ownerId */, false /* ownerCanAddInternalSystemWindow */, new TestIWindow());

        final WindowState win = newWindowBuilder(name, TYPE_BASE_APPLICATION).setWindowToken(

                app).setClientWindow(new TestIWindow()).build();

        mWm.mWindowMap.put(win.mClient.asBinder(), win);

        return win;

    }

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

+6 −6
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ public class TaskSnapshotCacheTest extends TaskSnapshotPersisterTestBase { 


    @Test

    public void testAppRemoved() {

        final WindowState window = createWindow(null, FIRST_APPLICATION_WINDOW, "window");

        final WindowState window = newWindowBuilder("window", FIRST_APPLICATION_WINDOW).build();

        mCache.putSnapshot(window.getTask(), createSnapshot());

        assertNotNull(mCache.getSnapshot(window.getTask().mTaskId, false /* isLowResolution */));

        mCache.onAppRemoved(window.mActivityRecord);
@@ -72,7 +72,7 @@ public class TaskSnapshotCacheTest extends TaskSnapshotPersisterTestBase { 


    @Test

    public void testAppDied() {

        final WindowState window = createWindow(null, FIRST_APPLICATION_WINDOW, "window");

        final WindowState window = newWindowBuilder("window", FIRST_APPLICATION_WINDOW).build();

        mCache.putSnapshot(window.getTask(), createSnapshot());

        assertNotNull(mCache.getSnapshot(window.getTask().mTaskId, false /* isLowResolution */));

        mCache.onAppDied(window.mActivityRecord);
@@ -81,7 +81,7 @@ public class TaskSnapshotCacheTest extends TaskSnapshotPersisterTestBase { 


    @Test

    public void testTaskRemoved() {

        final WindowState window = createWindow(null, FIRST_APPLICATION_WINDOW, "window");

        final WindowState window = newWindowBuilder("window", FIRST_APPLICATION_WINDOW).build();

        mCache.putSnapshot(window.getTask(), createSnapshot());

        assertNotNull(mCache.getSnapshot(window.getTask().mTaskId, false /* isLowResolution */));

        mCache.onIdRemoved(window.getTask().mTaskId);
@@ -90,7 +90,7 @@ public class TaskSnapshotCacheTest extends TaskSnapshotPersisterTestBase { 


    @Test

    public void testReduced_notCached() {

        final WindowState window = createWindow(null, FIRST_APPLICATION_WINDOW, "window");

        final WindowState window = newWindowBuilder("window", FIRST_APPLICATION_WINDOW).build();

        mPersister.persistSnapshot(window.getTask().mTaskId, mWm.mCurrentUserId, createSnapshot());

        mSnapshotPersistQueue.waitForQueueEmpty();

        assertNull(mCache.getSnapshot(window.getTask().mTaskId, false /* isLowResolution */));
@@ -105,7 +105,7 @@ public class TaskSnapshotCacheTest extends TaskSnapshotPersisterTestBase { 


    @Test

    public void testRestoreFromDisk() {

        final WindowState window = createWindow(null, FIRST_APPLICATION_WINDOW, "window");

        final WindowState window = newWindowBuilder("window", FIRST_APPLICATION_WINDOW).build();

        mPersister.persistSnapshot(window.getTask().mTaskId, mWm.mCurrentUserId, createSnapshot());

        mSnapshotPersistQueue.waitForQueueEmpty();

        assertNull(mCache.getSnapshot(window.getTask().mTaskId, false /* isLowResolution */));
@@ -117,7 +117,7 @@ public class TaskSnapshotCacheTest extends TaskSnapshotPersisterTestBase { 


    @Test

    public void testClearCache() {

        final WindowState window = createWindow(null, FIRST_APPLICATION_WINDOW, "window");

        final WindowState window = newWindowBuilder("window", FIRST_APPLICATION_WINDOW).build();

        mCache.putSnapshot(window.getTask(), mSnapshot);

        assertEquals(mSnapshot, mCache.getSnapshot(window.getTask().mTaskId,

                false /* isLowResolution */));