diff options
author | Jordan Demeulenaere <jdemeulenaere@google.com> | 2021-07-14 20:12:14 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-07-14 20:12:14 +0000 |
commit | 94240f3acd1a33fda00c7ec09f128a4438210189 (patch) | |
tree | e59c72e5b9f42f12c69f0e16a295ed3c89e57a3a | |
parent | 977e2adc143bbc0453a59c735631aa300f2d39bd (diff) | |
parent | 635655b8da8056fc62c76aa1c9aa01053d0b6f5d (diff) | |
download | base-94240f3acd1a33fda00c7ec09f128a4438210189.tar.gz |
Merge "Fix ActivityLaunchAnimatorTest crash" into sc-dev
-rw-r--r-- | packages/SystemUI/tests/src/com/android/systemui/animation/ActivityLaunchAnimatorTest.kt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/packages/SystemUI/tests/src/com/android/systemui/animation/ActivityLaunchAnimatorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/animation/ActivityLaunchAnimatorTest.kt index 33cc7821eba4..694b84a0b949 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/animation/ActivityLaunchAnimatorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/animation/ActivityLaunchAnimatorTest.kt @@ -10,6 +10,7 @@ import android.graphics.Rect import android.os.Looper import android.testing.AndroidTestingRunner import android.testing.TestableLooper.RunWithLooper +import android.util.Log import android.view.IRemoteAnimationFinishedCallback import android.view.RemoteAnimationAdapter import android.view.RemoteAnimationTarget @@ -27,6 +28,7 @@ import junit.framework.Assert.assertNotNull import junit.framework.Assert.assertNull import junit.framework.Assert.assertTrue import junit.framework.AssertionFailedError +import kotlin.concurrent.thread import org.junit.Before import org.junit.Rule import org.junit.Test @@ -39,7 +41,6 @@ import org.mockito.Mockito.never import org.mockito.Mockito.verify import org.mockito.Spy import org.mockito.junit.MockitoJUnit -import kotlin.concurrent.thread @SmallTest @RunWith(AndroidTestingRunner::class) @@ -50,6 +51,7 @@ class ActivityLaunchAnimatorTest : SysuiTestCase() { @Spy private val controller = TestLaunchAnimatorController(launchContainer) @Mock lateinit var iCallback: IRemoteAnimationFinishedCallback @Mock lateinit var startingSurface: StartingSurface + @Mock lateinit var failHandler: Log.TerribleFailureHandler private lateinit var activityLaunchAnimator: ActivityLaunchAnimator @get:Rule val rule = MockitoJUnit.rule() @@ -179,8 +181,10 @@ class ActivityLaunchAnimatorTest : SysuiTestCase() { } @Test - fun controllerFromOrphanViewReturnsNull() { + fun controllerFromOrphanViewReturnsNullAndIsATerribleFailure() { + Log.setWtfHandler(failHandler) assertNull(ActivityLaunchAnimator.Controller.fromView(View(mContext))) + verify(failHandler).onTerribleFailure(any(), any(), anyBoolean()) } private fun fakeWindow(): RemoteAnimationTarget { |