From c88227fee755b8db2bea36afe282d8fe1dfde6af Mon Sep 17 00:00:00 2001 From: Tiger Huang Date: Tue, 11 Feb 2020 17:43:12 +0800 Subject: [PATCH] Test more about InsetsSourceProvider.updateControlForTarget We added logic to the function, and this CL detects if the logic is broken. Bug; 149121559 Test: atest InsetsSourceProviderTest Change-Id: I5eadae67aa0c2555441b16d8ae0146fe18ad0632 --- .../server/wm/InsetsSourceProviderTest.java | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/services/tests/wmtests/src/com/android/server/wm/InsetsSourceProviderTest.java b/services/tests/wmtests/src/com/android/server/wm/InsetsSourceProviderTest.java index 7ffdd7cdceb61..f8117573efddc 100644 --- a/services/tests/wmtests/src/com/android/server/wm/InsetsSourceProviderTest.java +++ b/services/tests/wmtests/src/com/android/server/wm/InsetsSourceProviderTest.java @@ -112,11 +112,44 @@ public class InsetsSourceProviderTest extends WindowTestsBase { final WindowState statusBar = createWindow(null, TYPE_APPLICATION, "statusBar"); final WindowState target = createWindow(null, TYPE_APPLICATION, "target"); statusBar.getFrameLw().set(0, 0, 500, 100); + + // We must not have control or control target before we have the insets source window. + mProvider.updateControlForTarget(target, true /* force */); + assertNull(mProvider.getControl(target)); + assertNull(mProvider.getControlTarget()); + + // We can have the control or the control target after we have the insets source window. mProvider.setWindow(statusBar, null, null); mProvider.updateControlForTarget(target, false /* force */); assertNotNull(mProvider.getControl(target)); + assertNotNull(mProvider.getControlTarget()); + + // We must not have control or control target while we are performing seamless rotation. + // And the control and the control target must not be updated during that. + mProvider.startSeamlessRotation(); + assertNull(mProvider.getControl(target)); + assertNull(mProvider.getControlTarget()); + mProvider.updateControlForTarget(target, true /* force */); + assertNull(mProvider.getControl(target)); + assertNull(mProvider.getControlTarget()); + + // We can have the control and the control target after seamless rotation. + mProvider.finishSeamlessRotation(false /* timeout */); + mProvider.updateControlForTarget(target, false /* force */); + assertNotNull(mProvider.getControl(target)); + assertNotNull(mProvider.getControlTarget()); + + // We can clear the control and the control target. mProvider.updateControlForTarget(null, false /* force */); assertNull(mProvider.getControl(target)); + assertNull(mProvider.getControlTarget()); + + // We must not have control or control target if the insets source window doesn't have a + // surface. + statusBar.setSurfaceControl(null); + mProvider.updateControlForTarget(target, true /* force */); + assertNull(mProvider.getControl(target)); + assertNull(mProvider.getControlTarget()); } @Test