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

Commit f7d45e84 authored by Nergi Rahardi's avatar Nergi Rahardi
Browse files

Refactor various tests to use newWindowBuilder 

Bug: 383480021
Test: atest WmTests:ActivityStarterTests
Test: atest WmTests:FrameRateSelectionPriority
Test: atest WmTests:RefreshRatePolicyTest
Test: atest WmTests:RemoteAnimationControllerTest
Test: atest WmTests:SizeCompatTests
Test: atest WmTests:SyncEngineTests
Test: atest WmTests:TransitionTests
Test: atest WmTests:WallpaperControllerTests
Flag: EXEMPT cleaning up tests
Change-Id: I263163640b2471ba8652b07f924ee671fda95d33
parent 393f5840

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

+0 −6
Original line number Diff line number Diff line
@@ -361,12 +361,6 @@ public class ActivityStarterTests extends WindowTestsBase { 
        return prepareStarter(launchFlags, mockGetRootTask, LAUNCH_MULTIPLE);

    }



    private void setupImeWindow() {

        final WindowState imeWindow = createWindow(null, W_INPUT_METHOD,

                "mImeWindow", CURRENT_IME_UID);

        mDisplayContent.mInputMethodWindow = imeWindow;

    }



    /**

     * Creates a {@link ActivityStarter} with default parameters and necessary mocks.

     *

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

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ public class FrameRateSelectionPriorityTests extends WindowTestsBase { 
    private static final float MID_REFRESH_RATE = 70;

    private static final float LOW_REFRESH_RATE = 60;

    WindowState createWindow(String name) {

        WindowState window = createWindow(null, TYPE_APPLICATION, name);

        WindowState window = newWindowBuilder(name, TYPE_APPLICATION).build();

        when(window.mWmService.mDisplayManagerInternal.getRefreshRateSwitchingType())

                .thenReturn(DisplayManager.SWITCHING_TYPE_WITHIN_GROUPS);

        return window;

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

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ public class RefreshRatePolicyTest extends WindowTestsBase { 
    }



    WindowState createWindow(String name) {

        WindowState window = createWindow(null, TYPE_BASE_APPLICATION, name);

        WindowState window = newWindowBuilder(name, TYPE_BASE_APPLICATION).build();

        when(window.getDisplayInfo()).thenReturn(mDisplayInfo);

        when(window.mWmService.mDisplayManagerInternal.getRefreshRateSwitchingType())

                .thenReturn(DisplayManager.SWITCHING_TYPE_WITHIN_GROUPS);

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

+25 −22
Original line number Diff line number Diff line
@@ -114,8 +114,8 @@ public class RemoteAnimationControllerTest extends WindowTestsBase { 
    }



    private WindowState createAppOverlayWindow() {

        final WindowState win = createWindow(null /* parent */, TYPE_APPLICATION_OVERLAY,

                "testOverlayWindow");

        final WindowState win = newWindowBuilder("testOverlayWindow",

                TYPE_APPLICATION_OVERLAY).build();

        win.mActivityRecord = null;

        win.mHasSurface = true;

        return win;
@@ -123,7 +123,7 @@ public class RemoteAnimationControllerTest extends WindowTestsBase { 


    @Test

    public void testForwardsShowBackdrop() throws Exception {

        final WindowState win = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin");

        final WindowState win = createTestWindow();

        mDisplayContent.mOpeningApps.add(win.mActivityRecord);

        final WindowState overlayWin = createAppOverlayWindow();

        try {
@@ -156,7 +156,7 @@ public class RemoteAnimationControllerTest extends WindowTestsBase { 


    @Test

    public void testRun() throws Exception {

        final WindowState win = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin");

        final WindowState win = createTestWindow();

        mDisplayContent.mOpeningApps.add(win.mActivityRecord);

        final WindowState overlayWin = createAppOverlayWindow();

        try {
@@ -200,7 +200,7 @@ public class RemoteAnimationControllerTest extends WindowTestsBase { 


    @Test

    public void testCancel() throws Exception {

        final WindowState win = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin");

        final WindowState win = createTestWindow();

        final AnimationAdapter adapter = mController.createRemoteAnimationRecord(

                win.mActivityRecord,

                new Point(50, 100), null, new Rect(50, 100, 150, 150), null, false).mAdapter;
@@ -214,7 +214,7 @@ public class RemoteAnimationControllerTest extends WindowTestsBase { 


    @Test

    public void testTimeout() throws Exception {

        final WindowState win = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin");

        final WindowState win = createTestWindow();

        final AnimationAdapter adapter = mController.createRemoteAnimationRecord(

                win.mActivityRecord,

                new Point(50, 100), null, new Rect(50, 100, 150, 150), null, false).mAdapter;
@@ -234,8 +234,7 @@ public class RemoteAnimationControllerTest extends WindowTestsBase { 
    public void testTimeout_scaled() throws Exception {

        try {

            mWm.setAnimationScale(2, 5.0f);

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

                    "testWin");

            final WindowState win = createTestWindow();

            final AnimationAdapter adapter = mController.createRemoteAnimationRecord(

                    win.mActivityRecord, new Point(50, 100), null, new Rect(50, 100, 150, 150),

                    null, false).mAdapter;
@@ -268,7 +267,7 @@ public class RemoteAnimationControllerTest extends WindowTestsBase { 


    @Test

    public void testNotReallyStarted() throws Exception {

        final WindowState win = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin");

        final WindowState win = createTestWindow();

        mController.createRemoteAnimationRecord(win.mActivityRecord,

                new Point(50, 100), null, new Rect(50, 100, 150, 150), null, false);

        mController.goodToGo(TRANSIT_OLD_ACTIVITY_OPEN);
@@ -278,8 +277,8 @@ public class RemoteAnimationControllerTest extends WindowTestsBase { 


    @Test

    public void testOneNotStarted() throws Exception {

        final WindowState win1 = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin1");

        final WindowState win2 = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin2");

        final WindowState win1 = newWindowBuilder("testWin1", TYPE_BASE_APPLICATION).build();

        final WindowState win2 = newWindowBuilder("testWin2", TYPE_BASE_APPLICATION).build();

        mController.createRemoteAnimationRecord(win1.mActivityRecord,

                new Point(50, 100), null, new Rect(50, 100, 150, 150), null, false);

        final AnimationAdapter adapter = mController.createRemoteAnimationRecord(
@@ -306,7 +305,7 @@ public class RemoteAnimationControllerTest extends WindowTestsBase { 


    @Test

    public void testRemovedBeforeStarted() throws Exception {

        final WindowState win = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin");

        final WindowState win = createTestWindow();

        final AnimationAdapter adapter = mController.createRemoteAnimationRecord(

                win.mActivityRecord,

                new Point(50, 100), null, new Rect(50, 100, 150, 150), null, false).mAdapter;
@@ -322,7 +321,7 @@ public class RemoteAnimationControllerTest extends WindowTestsBase { 


    @Test

    public void testOpeningTaskWithTopFinishingActivity() {

        final WindowState win = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "win");

        final WindowState win = createTestWindow();

        final Task task = win.getTask();

        final ActivityRecord topFinishing = new ActivityBuilder(mAtm).setTask(task).build();

        // Now the task contains:
@@ -348,7 +347,7 @@ public class RemoteAnimationControllerTest extends WindowTestsBase { 


    @Test

    public void testChangeToSmallerSize() throws Exception {

        final WindowState win = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin");

        final WindowState win = createTestWindow();

        mDisplayContent.mChangingContainers.add(win.mActivityRecord);

        try {

            final RemoteAnimationRecord record = mController.createRemoteAnimationRecord(
@@ -402,7 +401,7 @@ public class RemoteAnimationControllerTest extends WindowTestsBase { 


    @Test

    public void testChangeTolargerSize() throws Exception {

        final WindowState win = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin");

        final WindowState win = createTestWindow();

        mDisplayContent.mChangingContainers.add(win.mActivityRecord);

        try {

            final RemoteAnimationRecord record = mController.createRemoteAnimationRecord(
@@ -456,7 +455,7 @@ public class RemoteAnimationControllerTest extends WindowTestsBase { 


    @Test

    public void testChangeToDifferentPosition() throws Exception {

        final WindowState win = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin");

        final WindowState win = createTestWindow();

        mDisplayContent.mChangingContainers.add(win.mActivityRecord);

        try {

            final RemoteAnimationRecord record = mController.createRemoteAnimationRecord(
@@ -515,7 +514,7 @@ public class RemoteAnimationControllerTest extends WindowTestsBase { 
                true, mDisplayContent, true /* ownerCanManageAppTokens */);

        spyOn(mDisplayContent.mWallpaperController);

        doReturn(true).when(mDisplayContent.mWallpaperController).isWallpaperVisible();

        final WindowState win = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin");

        final WindowState win = createTestWindow();

        mDisplayContent.mOpeningApps.add(win.mActivityRecord);

        try {

            final AnimationAdapter adapter = mController.createRemoteAnimationRecord(
@@ -548,7 +547,7 @@ public class RemoteAnimationControllerTest extends WindowTestsBase { 
                true, mDisplayContent, true /* ownerCanManageAppTokens */);

        spyOn(mDisplayContent.mWallpaperController);

        doReturn(true).when(mDisplayContent.mWallpaperController).isWallpaperVisible();

        final WindowState win = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin");

        final WindowState win = createTestWindow();

        mDisplayContent.mOpeningApps.add(win.mActivityRecord);

        try {

            final AnimationAdapter adapter = mController.createRemoteAnimationRecord(
@@ -581,7 +580,7 @@ public class RemoteAnimationControllerTest extends WindowTestsBase { 


    @Test

    public void testNonAppIncluded_keygaurdGoingAway() throws Exception {

        final WindowState win = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin");

        final WindowState win = createTestWindow();

        mDisplayContent.mOpeningApps.add(win.mActivityRecord);

        // Add overlay window hidden by the keyguard.

        final WindowState overlayWin = createAppOverlayWindow();
@@ -631,7 +630,7 @@ public class RemoteAnimationControllerTest extends WindowTestsBase { 
                true, mDisplayContent, true /* ownerCanManageAppTokens */);

        spyOn(mDisplayContent.mWallpaperController);

        doReturn(true).when(mDisplayContent.mWallpaperController).isWallpaperVisible();

        final WindowState win = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin");

        final WindowState win = createTestWindow();

        mDisplayContent.mOpeningApps.add(win.mActivityRecord);

        // Add overlay window hidden by the keyguard.

        final WindowState overlayWin = createAppOverlayWindow();
@@ -729,9 +728,9 @@ public class RemoteAnimationControllerTest extends WindowTestsBase { 
    }



    private AnimationAdapter setupForNonAppTargetNavBar(int transit, boolean shouldAttachNavBar) {

        final WindowState win = createWindow(null /* parent */, TYPE_BASE_APPLICATION, "testWin");

        final WindowState win = createTestWindow();

        mDisplayContent.mOpeningApps.add(win.mActivityRecord);

        final WindowState navBar = createWindow(null, TYPE_NAVIGATION_BAR, "NavigationBar");

        final WindowState navBar = newWindowBuilder("NavigationBar", TYPE_NAVIGATION_BAR).build();

        mDisplayContent.getDisplayPolicy().addWindowLw(navBar, navBar.mAttrs);

        final DisplayPolicy policy = mDisplayContent.getDisplayPolicy();

        spyOn(policy);
@@ -751,4 +750,8 @@ public class RemoteAnimationControllerTest extends WindowTestsBase { 
        verify(binder, atLeast(0)).asBinder();

        verifyNoMoreInteractions(binder);

    }



    private WindowState createTestWindow() {

        return newWindowBuilder("testWin", TYPE_BASE_APPLICATION).build();

    }

}

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

+8 −7
Original line number Diff line number Diff line
@@ -673,7 +673,8 @@ public class SizeCompatTests extends WindowTestsBase { 
        mActivity.mDisplayContent.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */);



        prepareUnresizable(mActivity, SCREEN_ORIENTATION_LANDSCAPE);

        final WindowState window = createWindow(null, TYPE_BASE_APPLICATION, mActivity, "window");

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

                mActivity).build();



        assertEquals(window, mActivity.findMainWindow());
@@ -3996,8 +3997,8 @@ public class SizeCompatTests extends WindowTestsBase { 
        resizeDisplay(display, 2200, 2280);

        display.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */);

        // Simulate insets, final app bounds are (0, 0, 2200, 2130) - landscape.

        final WindowState navbar = createWindow(null, TYPE_NAVIGATION_BAR, mDisplayContent,

                "navbar");

        final WindowState navbar = newWindowBuilder("navbar", TYPE_NAVIGATION_BAR).setDisplay(

                mDisplayContent).build();

        final Binder owner = new Binder();

        navbar.mAttrs.providedInsets = new InsetsFrameProvider[] {

                new InsetsFrameProvider(owner, 0, WindowInsets.Type.navigationBars())
@@ -4030,8 +4031,8 @@ public class SizeCompatTests extends WindowTestsBase { 
        resizeDisplay(display, 2200, 2280);

        display.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */);

        // Simulate taskbar, final app bounds are (0, 0, 2200, 2130) - landscape

        final WindowState navbar = createWindow(null, TYPE_NAVIGATION_BAR, mDisplayContent,

                "navbar");

        final WindowState navbar = newWindowBuilder("navbar", TYPE_NAVIGATION_BAR).setDisplay(

                mDisplayContent).build();

        final Binder owner = new Binder();

        navbar.mAttrs.providedInsets = new InsetsFrameProvider[] {

                new InsetsFrameProvider(owner, 0, WindowInsets.Type.navigationBars())
@@ -4059,8 +4060,8 @@ public class SizeCompatTests extends WindowTestsBase { 
        resizeDisplay(dc, 2200, 2280);

        dc.setIgnoreOrientationRequest(true /* ignoreOrientationRequest */);

        // Simulate taskbar, final app bounds are (0, 0, 2200, 2130) - landscape

        final WindowState navbar = createWindow(null, TYPE_NAVIGATION_BAR, mDisplayContent,

                "navbar");

        final WindowState navbar = newWindowBuilder("navbar", TYPE_NAVIGATION_BAR).setDisplay(

                mDisplayContent).build();

        final Binder owner = new Binder();

        navbar.mAttrs.providedInsets = new InsetsFrameProvider[] {

                new InsetsFrameProvider(owner, 0, WindowInsets.Type.navigationBars())