summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Matt Casey <mrcasey@google.com> 2024-04-11 18:51:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-04-11 18:51:58 +0000
commit6f9738e9e434710bc8b98f6bc3cf058c0b70f596 (patch)
treedec3ec66954fc79168ab3400623a7abfd016f452
parent42650607fca960117731b0e81adb6f4c23100140 (diff)
parent09515aa1ab7faae91880e786e1ea193a53fd3da7 (diff)
Merge "Ignore ActionExecutorTest#startSharedTransition_callsLaunchIntent" into 24D1-dev am: 09515aa1ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26922541 Change-Id: I4a27443fe1af272c08e47d57895d897ad523266c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--packages/SystemUI/tests/src/com/android/systemui/screenshot/ActionExecutorTest.kt2
1 files changed, 2 insertions, 0 deletions
diff --git a/packages/SystemUI/tests/src/com/android/systemui/screenshot/ActionExecutorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/screenshot/ActionExecutorTest.kt
index 5e7d8fb5df02..91f39126c67c 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/screenshot/ActionExecutorTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/screenshot/ActionExecutorTest.kt
@@ -28,6 +28,7 @@ import com.android.systemui.SysuiTestCase
import com.android.systemui.util.mockito.argumentCaptor
import com.android.systemui.util.mockito.mock
import com.google.common.truth.Truth.assertThat
+import kotlin.test.Ignore
import kotlin.test.Test
import kotlinx.coroutines.test.StandardTestDispatcher
import kotlinx.coroutines.test.TestCoroutineScheduler
@@ -55,6 +56,7 @@ class ActionExecutorTest : SysuiTestCase() {
private lateinit var actionExecutor: ActionExecutor
+ @Ignore // Fixed with newer mockito version (in main)
@Test
fun startSharedTransition_callsLaunchIntent() = runTest {
actionExecutor = createActionExecutor()