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

Commit e7facdeb authored by Mina Granic's avatar Mina Granic
Browse files

Pass WindowTestBase to Test Robots, to make use of utils. 

Flag: EXEMPT simple test refactoring.
Test: atest WmTests:CameraCompatFreeformPolicyTests
Fixes: 426403694
Change-Id: Ibadd2a11f85a7afdd4c9f848023682525830dbb9
parent 2583ac54

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

+15 −10
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ class AppCompatActivityRobot { 
    private final TestComponentStack<ActivityRecord> mActivityStack;

    @NonNull

    private final TestComponentStack<Task> mTaskStack;

    @NonNull

    private final WindowTestsBase mWindowTestsBase;



    private final int mDisplayWidth;

    private final int mDisplayHeight;
@@ -95,13 +97,13 @@ class AppCompatActivityRobot { 
    @Nullable

    private Consumer<DisplayContent> mOnPostDisplayContentCreation;



    AppCompatActivityRobot(@NonNull WindowManagerService wm,

            @NonNull ActivityTaskManagerService atm, @NonNull ActivityTaskSupervisor supervisor,

    AppCompatActivityRobot(@NonNull WindowTestsBase windowTestBase,

            int displayWidth, int displayHeight,

            @Nullable Consumer<ActivityRecord> onPostActivityCreation,

            @Nullable Consumer<DisplayContent> onPostDisplayContentCreation) {

        mAtm = atm;

        mSupervisor = supervisor;

        mAtm = windowTestBase.mAtm;

        mSupervisor = windowTestBase.mSupervisor;

        mWindowTestsBase = windowTestBase;

        mDisplayWidth = displayWidth;

        mDisplayHeight = displayHeight;

        mActivityStack = new TestComponentStack<>();
@@ -111,16 +113,14 @@ class AppCompatActivityRobot { 
        createNewDisplay();

    }



    AppCompatActivityRobot(@NonNull WindowManagerService wm,

            @NonNull ActivityTaskManagerService atm, @NonNull ActivityTaskSupervisor supervisor,

    AppCompatActivityRobot(@NonNull WindowTestsBase windowTestBase,

            int displayWidth, int displayHeight) {

        this(wm, atm, supervisor, displayWidth, displayHeight, /* onPostActivityCreation */ null,

        this(windowTestBase, displayWidth, displayHeight, /* onPostActivityCreation */ null,

                /* onPostDisplayContentCreation */ null);

    }



    AppCompatActivityRobot(@NonNull WindowManagerService wm,

            @NonNull ActivityTaskManagerService atm, @NonNull ActivityTaskSupervisor supervisor) {

        this(wm, atm, supervisor, DEFAULT_DISPLAY_WIDTH, DEFAULT_DISPLAY_HEIGHT);

    AppCompatActivityRobot(@NonNull WindowTestsBase windowTestBase) {

        this(windowTestBase, DEFAULT_DISPLAY_WIDTH, DEFAULT_DISPLAY_HEIGHT);

    }



    void createActivityWithComponent() {
@@ -189,6 +189,11 @@ class AppCompatActivityRobot { 
        return mDisplayContent;

    }



    @NonNull

    WindowTestsBase testBase() {

        return mWindowTestsBase;

    }



    @NonNull

    DisplayContent secondaryDisplayContent() {

        return mSecondaryDisplayContent;

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

+3 −6
Original line number Diff line number Diff line
@@ -470,17 +470,14 @@ public class AppCompatAspectRatioOverridesTest extends WindowTestsBase { 
     * Runs a test scenario providing a Robot.

     */

    void runTestScenario(@NonNull Consumer<AspectRatioOverridesRobotTest> consumer) {

        final AspectRatioOverridesRobotTest robot =

                new AspectRatioOverridesRobotTest(mWm, mAtm, mSupervisor);

        final AspectRatioOverridesRobotTest robot = new AspectRatioOverridesRobotTest(this);

        consumer.accept(robot);

    }



    private static class AspectRatioOverridesRobotTest extends AppCompatRobotBase {



        AspectRatioOverridesRobotTest(@NonNull WindowManagerService wm,

                @NonNull ActivityTaskManagerService atm,

                @NonNull ActivityTaskSupervisor supervisor) {

            super(wm, atm, supervisor);

        AspectRatioOverridesRobotTest(@NonNull WindowTestsBase windowTestBase) {

            super(windowTestBase);

        }



        @Override

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

+3 −5
Original line number Diff line number Diff line
@@ -444,16 +444,14 @@ public class AppCompatCameraOverridesTest extends WindowTestsBase { 
     * Runs a test scenario providing a Robot.

     */

    void runTestScenario(@NonNull Consumer<CameraOverridesRobotTest> consumer) {

        final CameraOverridesRobotTest robot = new CameraOverridesRobotTest(mWm, mAtm, mSupervisor);

        final CameraOverridesRobotTest robot = new CameraOverridesRobotTest(this);

        consumer.accept(robot);

    }



    private static class CameraOverridesRobotTest extends AppCompatRobotBase {



        CameraOverridesRobotTest(@NonNull WindowManagerService wm,

                @NonNull ActivityTaskManagerService atm,

                @NonNull ActivityTaskSupervisor supervisor) {

            super(wm, atm, supervisor);

        CameraOverridesRobotTest(@NonNull WindowTestsBase windowTestBase) {

            super(windowTestBase);

        }



        @Override

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

+3 −5
Original line number Diff line number Diff line
@@ -282,16 +282,14 @@ public class AppCompatCameraPolicyTest extends WindowTestsBase { 
     */

    void runTestScenario(@NonNull Consumer<AppCompatCameraPolicyRobotTest> consumer) {

        final AppCompatCameraPolicyRobotTest robot =

                new AppCompatCameraPolicyRobotTest(mWm, mAtm, mSupervisor);

                new AppCompatCameraPolicyRobotTest(this);

        consumer.accept(robot);

    }





    private static class AppCompatCameraPolicyRobotTest extends AppCompatRobotBase {

        AppCompatCameraPolicyRobotTest(@NonNull WindowManagerService wm,

                @NonNull ActivityTaskManagerService atm,

                @NonNull ActivityTaskSupervisor supervisor) {

            super(wm, atm, supervisor);

        AppCompatCameraPolicyRobotTest(@NonNull WindowTestsBase windowTestBase) {

            super(windowTestBase);

        }



        @Override

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

+4 −6
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ public class AppCompatCameraRotationStateTests extends WindowTestsBase { 
     */

    void runTestScenario(@NonNull Consumer<AppCompatCameraInfoProviderRobotTests> consumer) {

        final AppCompatCameraInfoProviderRobotTests robot =

                new AppCompatCameraInfoProviderRobotTests(mWm, mAtm, mSupervisor);

                new AppCompatCameraInfoProviderRobotTests(this);

        consumer.accept(robot);

    }
@@ -175,11 +175,9 @@ public class AppCompatCameraRotationStateTests extends WindowTestsBase { 
        private AppCompatCameraRotationState mCameraInfoProvider;

        private final WindowManagerService mWm;



        AppCompatCameraInfoProviderRobotTests(@NonNull WindowManagerService wm,

                @NonNull ActivityTaskManagerService atm,

                @NonNull ActivityTaskSupervisor supervisor) {

            super(wm, atm, supervisor);

            mWm = wm;

        AppCompatCameraInfoProviderRobotTests(@NonNull WindowTestsBase windowTestBase) {

            super(windowTestBase);

            mWm = windowTestBase.mWm;

            setupAppCompatConfiguration();

        }