commit 09e78b682d1180cc7670388478f5b0658cb19608
author Naomi Musgrave <nmusgrave@google.com> Wed Mar 30 17:20:30 2022 +0100
committer Naomi Musgrave <nmusgrave@google.com> Wed Mar 30 17:57:44 2022 +0100
tree f127f3c09e05db56fbef1fbd555c7fda77c970b7
parent db6cc772bd11629a4e51b9b3d1d9a927c101f271

[DO NOT MERGE] Parameterize compat tests, so tests consistently pass on sc-v2

Must investigate why tests with original structure will fail; suspected
missing change from T on sc-v2

Bug: 212643054
Test: atest android.server.wm.CompatChangeTests
Change-Id: If1c8925891aaec397ced9cec9ee793d01e6134c9

tests/framework/base/windowmanager/src/android/server/wm/CompatChangeTests.java

diff --git a/tests/framework/base/windowmanager/src/android/server/wm/CompatChangeTests.java b/tests/framework/base/windowmanager/src/android/server/wm/CompatChangeTests.java
index 7e5d5a1..16bdeb6 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/CompatChangeTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/CompatChangeTests.java
@@ -55,6 +55,11 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestRule;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * The test is focused on compatibility changes that have an effect on WM logic, and tests that
@@ -71,6 +76,7 @@
  * atest CtsWindowManagerDeviceTestCases:CompatChangeTests
  */
 @Presubmit
+@RunWith(Parameterized.class)
 public final class CompatChangeTests extends MultiDisplayTestBase {
     private static final ComponentName RESIZEABLE_PORTRAIT_ACTIVITY =
             component(ResizeablePortraitActivity.class);
@@ -96,6 +102,14 @@
 
     private static final float FLOAT_EQUALITY_DELTA = 0.01f;
 
+    @Parameterized.Parameters(name= "{0}")
+    public static List<Double> data() {
+        return Arrays.asList(0.5, 2.0);
+    }
+
+    @Parameterized.Parameter(0)
+    public double resizeRatio;
+
     @Rule
     public TestRule compatChangeRule = new PlatformCompatChangeRule();
 
@@ -490,10 +504,7 @@
         mWmState.computeState();
         WindowManagerState.DisplayContent originalDC = mWmState.getDisplay(DEFAULT_DISPLAY);
 
-        runSizeCompatTest(activity, windowingMode, /* resizeRatio= */ 0.5,
-                inSizeCompatModeAfterResize);
-        waitForRestoreDisplay(originalDC);
-        runSizeCompatTest(activity, windowingMode, /* resizeRatio= */ 2,
+        runSizeCompatTest(activity, windowingMode, resizeRatio,
                 inSizeCompatModeAfterResize);
     }
 
@@ -559,11 +570,7 @@
         mWmState.computeState();
         WindowManagerState.DisplayContent originalDC = mWmState.getDisplay(DEFAULT_DISPLAY);
 
-        runSizeCompatTest(activity, WINDOWING_MODE_FULLSCREEN, /* resizeRatio= */ 0.5,
-                inSizeCompatModeAfterResize);
-        assertSandboxedByProvidesMaxBounds(activity, isSandboxed);
-        waitForRestoreDisplay(originalDC);
-        runSizeCompatTest(activity, WINDOWING_MODE_FULLSCREEN, /* resizeRatio=*/ 2,
+        runSizeCompatTest(activity, WINDOWING_MODE_FULLSCREEN, resizeRatio,
                 inSizeCompatModeAfterResize);
         assertSandboxedByProvidesMaxBounds(activity, isSandboxed);
     }