Use static mocking in `DesktopModeLaunchParamsModifierTests`.
Bug: 335401172
Test: atest WmTests:DesktopModeLaunchParamsModifierTests
Change-Id: I58d4855148dc37abed39ecbc20bfa5999e92f914
diff --git a/services/core/java/com/android/server/wm/DesktopModeLaunchParamsModifier.java b/services/core/java/com/android/server/wm/DesktopModeLaunchParamsModifier.java
index 8069a93..d56b503 100644
--- a/services/core/java/com/android/server/wm/DesktopModeLaunchParamsModifier.java
+++ b/services/core/java/com/android/server/wm/DesktopModeLaunchParamsModifier.java
@@ -48,15 +48,8 @@
/**
* Flag to indicate whether to restrict desktop mode to supported devices.
*/
- @VisibleForTesting
- static final String ENFORCE_DEVICE_RESTRICTIONS_KEY =
- "persist.wm.debug.desktop_mode_enforce_device_restrictions";
-
- /**
- * Flag to indicate whether to restrict desktop mode to supported devices.
- */
private static final boolean ENFORCE_DEVICE_RESTRICTIONS = SystemProperties.getBoolean(
- ENFORCE_DEVICE_RESTRICTIONS_KEY, true);
+ "persist.wm.debug.desktop_mode_enforce_device_restrictions", true);
private StringBuilder mLogBuilder;
diff --git a/services/tests/wmtests/src/com/android/server/wm/DesktopModeLaunchParamsModifierTests.java b/services/tests/wmtests/src/com/android/server/wm/DesktopModeLaunchParamsModifierTests.java
index 89ae802..feef6b1 100644
--- a/services/tests/wmtests/src/com/android/server/wm/DesktopModeLaunchParamsModifierTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/DesktopModeLaunchParamsModifierTests.java
@@ -21,8 +21,8 @@
import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;
import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;
+import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;
import static com.android.server.wm.DesktopModeLaunchParamsModifier.DESKTOP_MODE_INITIAL_BOUNDS_SCALE;
-import static com.android.server.wm.DesktopModeLaunchParamsModifier.ENFORCE_DEVICE_RESTRICTIONS_KEY;
import static com.android.server.wm.LaunchParamsController.LaunchParamsModifier.PHASE_BOUNDS;
import static com.android.server.wm.LaunchParamsController.LaunchParamsModifier.PHASE_DISPLAY;
import static com.android.server.wm.LaunchParamsController.LaunchParamsModifier.RESULT_CONTINUE;
@@ -30,21 +30,16 @@
import static com.android.server.wm.LaunchParamsController.LaunchParamsModifier.RESULT_SKIP;
import static org.junit.Assert.assertEquals;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.doReturn;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import android.content.res.Resources;
import android.graphics.Rect;
-import android.os.SystemProperties;
import android.platform.test.annotations.DisableFlags;
import android.platform.test.annotations.EnableFlags;
import android.platform.test.annotations.Presubmit;
import androidx.test.filters.SmallTest;
-import com.android.internal.R;
import com.android.server.wm.LaunchParamsController.LaunchParamsModifier.Result;
import com.android.window.flags.Flags;
@@ -52,7 +47,6 @@
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
-import org.mockito.Mockito;
/**
* Tests for desktop mode task bounds.
@@ -80,6 +74,8 @@
mCurrent.reset();
mResult = new LaunchParamsController.LaunchParams();
mResult.reset();
+
+ mTarget = new DesktopModeLaunchParamsModifier(mContext);
}
@Test
@@ -208,15 +204,10 @@
private void setupDesktopModeLaunchParamsModifier(boolean isDesktopModeSupported,
boolean enforceDeviceRestrictions) {
- Resources mockResources = Mockito.mock(Resources.class);
- when(mockResources.getBoolean(eq(R.bool.config_isDesktopModeSupported)))
- .thenReturn(isDesktopModeSupported);
- doReturn(mockResources).when(mContext).getResources();
-
- SystemProperties.set(ENFORCE_DEVICE_RESTRICTIONS_KEY,
- String.valueOf(enforceDeviceRestrictions));
-
- mTarget = new DesktopModeLaunchParamsModifier(mContext);
+ doReturn(isDesktopModeSupported)
+ .when(() -> DesktopModeLaunchParamsModifier.isDesktopModeSupported(any()));
+ doReturn(enforceDeviceRestrictions)
+ .when(DesktopModeLaunchParamsModifier::enforceDeviceRestrictions);
}
private class CalculateRequestBuilder {
diff --git a/services/tests/wmtests/src/com/android/server/wm/SystemServicesTestRule.java b/services/tests/wmtests/src/com/android/server/wm/SystemServicesTestRule.java
index 64adff8..87f26e5 100644
--- a/services/tests/wmtests/src/com/android/server/wm/SystemServicesTestRule.java
+++ b/services/tests/wmtests/src/com/android/server/wm/SystemServicesTestRule.java
@@ -200,6 +200,7 @@
.mockStatic(DisplayControl.class, mockStubOnly)
.mockStatic(LockGuard.class, mockStubOnly)
.mockStatic(Watchdog.class, mockStubOnly)
+ .spyStatic(DesktopModeLaunchParamsModifier.class)
.strictness(Strictness.LENIENT)
.startMocking();