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

Commit 1fd8ca0f authored by Nergi Rahardi's avatar Nergi Rahardi
Browse files

Refactor Display.*Tests to use WindowStateBuilder 

Combining multiple classes since the changes are small
- DisplayAreaTests
- DisplayPolicyLayoutTests
- DisplayPolicyTests

Bug: 383480021
Test: atest WmTests:DisplayAreaTest
Test: atest WmTests:DisplayPolicyLayoutTests
Test: atest WmTests:DisplayPolicyTests
Flag: EXEMPT cleaning up tests
Change-Id: I66d8d18514443309f5bf9fd8204fa6cc4bbee159
parent c05c4e0e

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -450,7 +450,7 @@ public class DisplayAreaTest extends WindowTestsBase { 
    public void testGetOrientation() {

    public void testGetOrientation() {

        final DisplayArea.Tokens area = new DisplayArea.Tokens(mWm, ABOVE_TASKS, "test");

        final DisplayArea.Tokens area = new DisplayArea.Tokens(mWm, ABOVE_TASKS, "test");

        mDisplayContent.addChild(area, POSITION_TOP);

        mDisplayContent.addChild(area, POSITION_TOP);

        final WindowState win = createWindow(null, TYPE_APPLICATION_OVERLAY, "overlay");

        final WindowState win = newWindowBuilder("overlay", TYPE_APPLICATION_OVERLAY).build();

        win.mAttrs.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;

        win.mAttrs.screenOrientation = ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;

        win.mToken.reparent(area, POSITION_TOP);

        win.mToken.reparent(area, POSITION_TOP);

        spyOn(win);

        spyOn(win);

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -76,7 +76,7 @@ public class DisplayPolicyLayoutTests extends DisplayPolicyTestsBase { 




    @Before

    @Before

    public void setUp() throws Exception {

    public void setUp() throws Exception {

        mWindow = spy(createWindow(null, TYPE_APPLICATION, "window"));

        mWindow = spy(newWindowBuilder("window", TYPE_APPLICATION).build());





        spyOn(mStatusBarWindow);

        spyOn(mStatusBarWindow);

        spyOn(mNavBarWindow);

        spyOn(mNavBarWindow);
@@ -147,7 +147,7 @@ public class DisplayPolicyLayoutTests extends DisplayPolicyTestsBase { 
    public void addingWindow_withInsetsTypes() {

    public void addingWindow_withInsetsTypes() {

        mDisplayPolicy.removeWindowLw(mStatusBarWindow);  // Removes the existing one.

        mDisplayPolicy.removeWindowLw(mStatusBarWindow);  // Removes the existing one.





        final WindowState win = createWindow(null, TYPE_STATUS_BAR_SUB_PANEL, "statusBar");

        final WindowState win = newWindowBuilder("statusBar", TYPE_STATUS_BAR_SUB_PANEL).build();

        final Binder owner = new Binder();

        final Binder owner = new Binder();

        win.mAttrs.providedInsets = new InsetsFrameProvider[] {

        win.mAttrs.providedInsets = new InsetsFrameProvider[] {

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

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

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

+6 −6
Original line number Original line Diff line number Diff line
@@ -76,7 +76,7 @@ import org.junit.runner.RunWith; 
public class DisplayPolicyTests extends WindowTestsBase {

public class DisplayPolicyTests extends WindowTestsBase {





    private WindowState createOpaqueFullscreen(boolean hasLightNavBar) {

    private WindowState createOpaqueFullscreen(boolean hasLightNavBar) {

        final WindowState win = createWindow(null, TYPE_BASE_APPLICATION, "opaqueFullscreen");

        final WindowState win = newWindowBuilder("opaqueFullscreen", TYPE_BASE_APPLICATION).build();

        final WindowManager.LayoutParams attrs = win.mAttrs;

        final WindowManager.LayoutParams attrs = win.mAttrs;

        attrs.width = MATCH_PARENT;

        attrs.width = MATCH_PARENT;

        attrs.height = MATCH_PARENT;

        attrs.height = MATCH_PARENT;
@@ -99,7 +99,7 @@ public class DisplayPolicyTests extends WindowTestsBase { 
    }

    }





    private WindowState createDimmingDialogWindow(boolean canBeImTarget) {

    private WindowState createDimmingDialogWindow(boolean canBeImTarget) {

        final WindowState win = spy(createWindow(null, TYPE_APPLICATION, "dimmingDialog"));

        final WindowState win = spy(newWindowBuilder("dimmingDialog", TYPE_APPLICATION).build());

        final WindowManager.LayoutParams attrs = win.mAttrs;

        final WindowManager.LayoutParams attrs = win.mAttrs;

        attrs.width = WRAP_CONTENT;

        attrs.width = WRAP_CONTENT;

        attrs.height = WRAP_CONTENT;

        attrs.height = WRAP_CONTENT;
@@ -111,7 +111,7 @@ public class DisplayPolicyTests extends WindowTestsBase { 




    private WindowState createInputMethodWindow(boolean visible, boolean drawNavBar,

    private WindowState createInputMethodWindow(boolean visible, boolean drawNavBar,

            boolean hasLightNavBar) {

            boolean hasLightNavBar) {

        final WindowState win = createWindow(null, TYPE_INPUT_METHOD, "inputMethod");

        final WindowState win = newWindowBuilder("inputMethod", TYPE_INPUT_METHOD).build();

        final WindowManager.LayoutParams attrs = win.mAttrs;

        final WindowManager.LayoutParams attrs = win.mAttrs;

        attrs.width = MATCH_PARENT;

        attrs.width = MATCH_PARENT;

        attrs.height = MATCH_PARENT;

        attrs.height = MATCH_PARENT;
@@ -301,7 +301,7 @@ public class DisplayPolicyTests extends WindowTestsBase { 
    }

    }





    private WindowState createApplicationWindow() {

    private WindowState createApplicationWindow() {

        final WindowState win = createWindow(null, TYPE_APPLICATION, "Application");

        final WindowState win = newWindowBuilder("Application", TYPE_APPLICATION).build();

        final WindowManager.LayoutParams attrs = win.mAttrs;

        final WindowManager.LayoutParams attrs = win.mAttrs;

        attrs.width = MATCH_PARENT;

        attrs.width = MATCH_PARENT;

        attrs.height = MATCH_PARENT;

        attrs.height = MATCH_PARENT;
@@ -312,7 +312,7 @@ public class DisplayPolicyTests extends WindowTestsBase { 
    }

    }





    private WindowState createBaseApplicationWindow() {

    private WindowState createBaseApplicationWindow() {

        final WindowState win = createWindow(null, TYPE_BASE_APPLICATION, "Application");

        final WindowState win = newWindowBuilder("Application", TYPE_BASE_APPLICATION).build();

        final WindowManager.LayoutParams attrs = win.mAttrs;

        final WindowManager.LayoutParams attrs = win.mAttrs;

        attrs.width = MATCH_PARENT;

        attrs.width = MATCH_PARENT;

        attrs.height = MATCH_PARENT;

        attrs.height = MATCH_PARENT;
@@ -450,7 +450,7 @@ public class DisplayPolicyTests extends WindowTestsBase { 
        displayPolicy.getDecorInsetsInfo(Surface.ROTATION_90, di.logicalHeight, di.logicalWidth);

        displayPolicy.getDecorInsetsInfo(Surface.ROTATION_90, di.logicalHeight, di.logicalWidth);

        // Add a window that provides the same insets in current rotation. But it specifies

        // Add a window that provides the same insets in current rotation. But it specifies

        // different insets in other rotations.

        // different insets in other rotations.

        final WindowState bar2 = createWindow(null, navbar.mAttrs.type, "bar2");

        final WindowState bar2 = newWindowBuilder("bar2", navbar.mAttrs.type).build();

        bar2.mAttrs.providedInsets = new InsetsFrameProvider[] {

        bar2.mAttrs.providedInsets = new InsetsFrameProvider[] {

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

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

                        .setInsetsSize(Insets.of(0, 0, 0, NAV_BAR_HEIGHT))

                        .setInsetsSize(Insets.of(0, 0, 0, NAV_BAR_HEIGHT))