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

Commit 8ab1300f authored by Mina Granic's avatar Mina Granic Committed by Android (Google) Code Review
Browse files

Merge "Create Robot for Desktop Windowing testing." into main

parents 1f9f92bd 2b1db2d7

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

+10 −18
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.server.wm; 


import static android.content.pm.ActivityInfo.OVERRIDE_MIN_ASPECT_RATIO_ONLY_FOR_CAMERA;



import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn;

import static com.android.server.wm.AppCompatCameraPolicy.isTreatmentEnabledForActivity;

import static com.android.server.wm.AppCompatCameraPolicy.shouldOverrideMinAspectRatioForCamera;
@@ -26,7 +25,6 @@ import static com.android.window.flags.Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKT 


import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertTrue;

import static org.mockito.ArgumentMatchers.any;



import android.compat.testing.PlatformCompatChangeRule;

import android.platform.test.annotations.DisableFlags;
@@ -90,7 +88,7 @@ public class AppCompatCameraPolicyTest extends WindowTestsBase { 
    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    public void testCameraCompatFreeformPolicy_presentWhenEnabledAndDW() {

        runTestScenario((robot) -> {

            robot.allowEnterDesktopMode(/* isAllowed= */ true);

            robot.dw().allowEnterDesktopMode(/* isAllowed= */ true);

            robot.activity().createActivityWithComponentInNewTaskAndDisplay();

            robot.checkTopActivityHasCameraCompatFreeformPolicy(/* exists= */ true);

        });
@@ -100,7 +98,7 @@ public class AppCompatCameraPolicyTest extends WindowTestsBase { 
    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    public void testCameraCompatFreeformPolicy_notPresentWhenNoDW() {

        runTestScenario((robot) -> {

            robot.allowEnterDesktopMode(/* isAllowed= */ false);

            robot.dw().allowEnterDesktopMode(/* isAllowed= */ false);

            robot.activity().createActivityWithComponentInNewTaskAndDisplay();

            robot.checkTopActivityHasCameraCompatFreeformPolicy(/* exists= */ false);

        });
@@ -110,7 +108,7 @@ public class AppCompatCameraPolicyTest extends WindowTestsBase { 
    @DisableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    public void testCameraCompatFreeformPolicy_notPresentWhenNoFlag() {

        runTestScenario((robot) -> {

            robot.allowEnterDesktopMode(/* isAllowed= */ true);

            robot.dw().allowEnterDesktopMode(/* isAllowed= */ true);

            robot.activity().createActivityWithComponentInNewTaskAndDisplay();

            robot.checkTopActivityHasCameraCompatFreeformPolicy(/* exists= */ false);

        });
@@ -120,7 +118,7 @@ public class AppCompatCameraPolicyTest extends WindowTestsBase { 
    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    public void testCameraCompatFreeformPolicy_notPresentWhenNoFlagAndNoDW() {

        runTestScenario((robot) -> {

            robot.allowEnterDesktopMode(/* isAllowed= */ false);

            robot.dw().allowEnterDesktopMode(/* isAllowed= */ false);

            robot.activity().createActivityWithComponentInNewTaskAndDisplay();

            robot.checkTopActivityHasCameraCompatFreeformPolicy(/* exists= */ false);

        });
@@ -130,7 +128,7 @@ public class AppCompatCameraPolicyTest extends WindowTestsBase { 
    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    public void testCameraCompatFreeformPolicy_startedWhenEnabledAndDW() {

        runTestScenario((robot) -> {

            robot.allowEnterDesktopMode(/* isAllowed= */ true);

            robot.dw().allowEnterDesktopMode(/* isAllowed= */ true);

            robot.activity().createActivityWithComponentInNewTaskAndDisplay();

            robot.checkTopActivityHasCameraCompatFreeformPolicy(/* exists= */ true);

            robot.checkTopActivityCameraCompatFreeformPolicyIsRunning();
@@ -141,7 +139,7 @@ public class AppCompatCameraPolicyTest extends WindowTestsBase { 
    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    public void testCameraStateManager_existsWhenCameraCompatFreeformExists() {

        runTestScenario((robot) -> {

            robot.allowEnterDesktopMode(true);

            robot.dw().allowEnterDesktopMode(true);

            robot.activity().createActivityWithComponentInNewTaskAndDisplay();

            robot.checkTopActivityHasCameraCompatFreeformPolicy(/* exists= */ true);

            robot.checkTopActivityHasCameraStateMonitor(/* exists= */ true);
@@ -152,7 +150,7 @@ public class AppCompatCameraPolicyTest extends WindowTestsBase { 
    @EnableFlags(FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING)

    public void testCameraStateManager_startedWhenCameraCompatFreeformExists() {

        runTestScenario((robot) -> {

            robot.allowEnterDesktopMode(true);

            robot.dw().allowEnterDesktopMode(true);

            robot.activity().createActivityWithComponentInNewTaskAndDisplay();

            robot.checkTopActivityHasCameraCompatFreeformPolicy(/* exists= */ true);

            robot.checkTopActivityHasCameraStateMonitor(/* exists= */ true);
@@ -224,7 +222,7 @@ public class AppCompatCameraPolicyTest extends WindowTestsBase { 
    public void testShouldOverrideMinAspectRatioForCamera_whenCameraIsNotRunning() {

        runTestScenario((robot) -> {

            robot.applyOnActivity((a)-> {

                robot.allowEnterDesktopMode(true);

                robot.dw().allowEnterDesktopMode(true);

                robot.conf().enableCameraCompatTreatmentAtBuildTime(/* enabled= */ true);

                a.createActivityWithComponentInNewTaskAndDisplay();

                a.setIsCameraRunningAndWindowingModeEligibleFullscreen(/* enabled */ false);
@@ -239,7 +237,7 @@ public class AppCompatCameraPolicyTest extends WindowTestsBase { 
    public void testShouldOverrideMinAspectRatioForCamera_whenCameraIsRunning_overrideDisabled() {

        runTestScenario((robot) -> {

            robot.applyOnActivity((a)-> {

                robot.allowEnterDesktopMode(true);

                robot.dw().allowEnterDesktopMode(true);

                robot.conf().enableCameraCompatTreatmentAtBuildTime(/* enabled= */ true);

                a.createActivityWithComponentInNewTaskAndDisplay();

                a.setIsCameraRunningAndWindowingModeEligibleFullscreen(/* active */ true);
@@ -270,7 +268,7 @@ public class AppCompatCameraPolicyTest extends WindowTestsBase { 
    public void testShouldOverrideMinAspectRatioForCameraFreeform_cameraRunning_overrideEnabled() {

        runTestScenario((robot) -> {

            robot.applyOnActivity((a)-> {

                robot.allowEnterDesktopMode(true);

                robot.dw().allowEnterDesktopMode(true);

                a.createActivityWithComponentInNewTaskAndDisplay();

                a.setIsCameraRunningAndWindowingModeEligibleFreeform(/* active */ true);

            });
@@ -346,11 +344,5 @@ public class AppCompatCameraPolicyTest extends WindowTestsBase { 
        void checkShouldOverrideMinAspectRatioForCamera(boolean expected) {

            assertEquals(expected, shouldOverrideMinAspectRatioForCamera(activity().top()));

        }



        // TODO(b/350460645): Create Desktop Windowing Robot to reuse common functionalities.

        void allowEnterDesktopMode(boolean isAllowed) {

            doReturn(isAllowed).when(() ->

                    DesktopModeHelper.canEnterDesktopMode(any()));

        }

    }

}

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

+1 −9
Original line number Diff line number Diff line
@@ -37,12 +37,10 @@ import static android.view.WindowManager.PROPERTY_COMPAT_ALLOW_ORIENTATION_OVERR 
import static android.view.WindowManager.PROPERTY_COMPAT_ALLOW_USER_ASPECT_RATIO_FULLSCREEN_OVERRIDE;

import static android.view.WindowManager.PROPERTY_COMPAT_IGNORE_REQUESTED_ORIENTATION;



import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.spyOn;

import static com.android.window.flags.Flags.FLAG_ENABLE_CAMERA_COMPAT_FOR_DESKTOP_WINDOWING;



import static org.junit.Assert.assertEquals;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Mockito.verify;



import android.compat.testing.PlatformCompatChangeRule;
@@ -338,7 +336,7 @@ public class AppCompatOrientationPolicyTest extends WindowTestsBase { 
    public void testOverrideOrientationIfNeeded_fullscrOverrideFreeform_cameraActivity_unchanged() {

        runTestScenario((robot) -> {

            robot.applyOnActivity((a) -> {

                robot.allowEnterDesktopMode(true);

                robot.dw().allowEnterDesktopMode(true);

                a.createActivityWithComponentInNewTaskAndDisplay();

                a.setIsCameraRunningAndWindowingModeEligibleFreeform(false);

            });
@@ -610,11 +608,5 @@ public class AppCompatOrientationPolicyTest extends WindowTestsBase { 
        private AppCompatOrientationPolicy getTopAppCompatOrientationPolicy() {

            return activity().top().mAppCompatController.getOrientationPolicy();

        }



        // TODO(b/350460645): Create Desktop Windowing Robot to reuse common functionalities.

        void allowEnterDesktopMode(boolean isAllowed) {

            doReturn(isAllowed).when(() ->

                    DesktopModeHelper.canEnterDesktopMode(any()));

        }

    }

}

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

+8 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ abstract class AppCompatRobotBase { 
    private final AppCompatComponentPropRobot mOptPropRobot;

    @NonNull

    private final AppCompatResourcesRobot mResourcesRobot;

    @NonNull

    private final DesktopWindowingRobot mDesktopWindowingRobot;



    AppCompatRobotBase(@NonNull WindowManagerService wm,

            @NonNull ActivityTaskManagerService atm,
@@ -51,6 +53,7 @@ abstract class AppCompatRobotBase { 
                new AppCompatConfigurationRobot(wm.mAppCompatConfiguration);

        mOptPropRobot = new AppCompatComponentPropRobot(wm);

        mResourcesRobot = new AppCompatResourcesRobot(wm.mContext.getResources());

        mDesktopWindowingRobot = new DesktopWindowingRobot();

    }



    AppCompatRobotBase(@NonNull WindowManagerService wm,
@@ -111,6 +114,11 @@ abstract class AppCompatRobotBase { 
        return mResourcesRobot;

    }



    @NonNull

    DesktopWindowingRobot dw() {

        return mDesktopWindowingRobot;

    }



    void applyOnResources(@NonNull Consumer<AppCompatResourcesRobot> consumer) {

        consumer.accept(mResourcesRobot);

    }

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

0 → 100644
+28 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.server.wm;



import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;



import static org.mockito.ArgumentMatchers.any;



/** Robot for changing desktop windowing properties. */

class DesktopWindowingRobot {

    void allowEnterDesktopMode(boolean isAllowed) {

        doReturn(isAllowed).when(() -> DesktopModeHelper.canEnterDesktopMode(any()));

    }

}