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

Commit 6bec0b4f authored by Wale Ogunwale's avatar Wale Ogunwale
Browse files

Renamed WmServiceUtils.java to TestSystemServices.java 

In preperation for having the class correctly mock all services
for test.

Test: Existing tests pass.
Change-Id: Ifecc9cf59139c04741ddd041fd7918b66970bfc1
parent 976ca472

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

+2 −2
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ public class AppTransitionTests extends WindowTestsBase { 


    @BeforeClass

    public static void setUpRootWindowContainerMock() {

        final WindowManagerService wm = WmServiceUtils.getWindowManagerService();

        final WindowManagerService wm = TestSystemServices.getWindowManagerService();

        // For unit test, we don't need to test performSurfacePlacement to prevent some abnormal

        // interaction with surfaceflinger native side.

        sOriginalRootWindowContainer = wm.mRoot;
@@ -74,7 +74,7 @@ public class AppTransitionTests extends WindowTestsBase { 


    @AfterClass

    public static void tearDownRootWindowContainerMock() {

        final WindowManagerService wm = WmServiceUtils.getWindowManagerService();

        final WindowManagerService wm = TestSystemServices.getWindowManagerService();

        wm.mRoot = sOriginalRootWindowContainer;

        sOriginalRootWindowContainer = null;

    }

services/tests/wmtests/src/com/android/server/wm/WmServiceUtils.java→services/tests/wmtests/src/com/android/server/wm/TestSystemServices.java

+3 −3
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ import java.util.concurrent.CountDownLatch; 
/**

 * A Test utility class to create a mock {@link WindowManagerService} instance for tests.

 */

class WmServiceUtils {

class TestSystemServices {

    private static StaticMockitoSession sMockitoSession;

    private static WindowManagerService sService;

    private static TestWindowManagerPolicy sPolicy;
@@ -78,7 +78,7 @@ class WmServiceUtils { 
                .strictness(Strictness.LENIENT)

                .startMocking();



        runWithDexmakerShareClassLoader(WmServiceUtils::setUpTestWindowService);

        runWithDexmakerShareClassLoader(TestSystemServices::setUpTestWindowService);

    }



    static void tearDownWindowManagerService() {
@@ -147,7 +147,7 @@ class WmServiceUtils { 
        final WindowManagerGlobalLock wmLock = new WindowManagerGlobalLock();

        doReturn(wmLock).when(atms).getGlobalLock();



        sPolicy = new TestWindowManagerPolicy(WmServiceUtils::getWindowManagerService);

        sPolicy = new TestWindowManagerPolicy(TestSystemServices::getWindowManagerService);

        sService = WindowManagerService.main(context, ims, false, false, sPolicy, atms);



        sService.onInitReady();

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

+5 −5
Original line number Diff line number Diff line
@@ -101,14 +101,14 @@ class WindowTestsBase { 
    public static void setUpOnceBase() {

        AttributeCache.init(getInstrumentation().getTargetContext());



        WmServiceUtils.setUpWindowManagerService();

        TestSystemServices.setUpWindowManagerService();



        sPowerManagerWrapper = mock(WindowState.PowerManagerWrapper.class);

    }



    @AfterClass

    public static void tearDonwOnceBase() {

        WmServiceUtils.tearDownWindowManagerService();

        TestSystemServices.tearDownWindowManagerService();

    }



    @Before
@@ -120,7 +120,7 @@ class WindowTestsBase { 


            final Context context = getInstrumentation().getTargetContext();



            mWm = WmServiceUtils.getWindowManagerService();

            mWm = TestSystemServices.getWindowManagerService();

            beforeCreateDisplay();



            context.getDisplay().getDisplayInfo(mDisplayInfo);
@@ -198,7 +198,7 @@ class WindowTestsBase { 
            }



            // Cleaned up everything in Handler.

            WmServiceUtils.cleanupWindowManagerHandlers();

            TestSystemServices.cleanupWindowManagerHandlers();

        } catch (Exception e) {

            Log.e(TAG, "Failed to tear down test", e);

            throw e;
@@ -219,7 +219,7 @@ class WindowTestsBase { 
     * Waits until the main handler for WM has processed all messages.

     */

    void waitUntilHandlersIdle() {

        WmServiceUtils.waitUntilWindowManagerHandlersIdle();

        TestSystemServices.waitUntilWindowManagerHandlersIdle();

    }



    private WindowToken createWindowToken(