From 4dbe518c86bd38e3414dff90238bbf5a064b7ec6 Mon Sep 17 00:00:00 2001 From: Lucas Dupin Date: Thu, 7 Mar 2019 18:20:11 -0800 Subject: [PATCH] Ensure inital and final state Make sure we're in an expected state when the test starts, and that animations will be cancelled when it ends. Fixes: 124858892 Test: atest ScrimControllerTest Change-Id: Ia0395f47968fea6559b4279ea7bcc6a87a4e4582 --- .../statusbar/phone/ScrimControllerTest.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java index 6db36243bb072..b85d058494883 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/ScrimControllerTest.java @@ -51,6 +51,7 @@ import com.android.systemui.statusbar.ScrimView; import com.android.systemui.util.wakelock.WakeLock; import com.android.systemui.utils.os.FakeHandler; +import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -99,12 +100,13 @@ public class ScrimControllerTest extends SysuiTestCase { visible -> mScrimVisibility = visible, mDozeParamenters, mAlarmManager); mScrimController.setHasBackdrop(false); mScrimController.setWallpaperSupportsAmbientMode(false); + mScrimController.transitionTo(ScrimState.KEYGUARD); + mScrimController.finishAnimationsImmediately(); } - @Test - public void initialState() { - Assert.assertEquals("ScrimController should start initialized", - mScrimController.getState(), ScrimState.UNINITIALIZED); + @After + public void tearDown() { + mScrimController.finishAnimationsImmediately(); } @Test @@ -307,13 +309,13 @@ public class ScrimControllerTest extends SysuiTestCase { reset(mScrimBehind); mScrimController.setPanelExpansion(0f); mScrimController.setPanelExpansion(1.0f); - mScrimController.onPreDraw(); + mScrimController.finishAnimationsImmediately(); Assert.assertEquals("Scrim alpha should change after setPanelExpansion", mScrimBehindAlpha, mScrimBehind.getViewAlpha(), 0.01f); mScrimController.setPanelExpansion(0f); - mScrimController.onPreDraw(); + mScrimController.finishAnimationsImmediately(); Assert.assertEquals("Scrim alpha should change after setPanelExpansion", mScrimBehindAlpha, mScrimBehind.getViewAlpha(), 0.01f); @@ -336,6 +338,7 @@ public class ScrimControllerTest extends SysuiTestCase { mScrimController.setExpansionAffectsAlpha(true); mScrimController.setPanelExpansion(0.1f); + mScrimController.finishAnimationsImmediately(); Assert.assertNotEquals("Scrim opacity should change when setExpansionAffectsAlpha " + "is true", scrimAlpha, mScrimBehind.getViewAlpha(), 0.01f); }