diff options
10 files changed, 69 insertions, 78 deletions
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/domain/interactor/MediaControlInteractorTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/domain/interactor/MediaControlInteractorTest.kt index bd3b77a678db..365a7c3a296a 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/domain/interactor/MediaControlInteractorTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/domain/interactor/MediaControlInteractorTest.kt @@ -45,16 +45,16 @@ import com.android.systemui.plugins.activityStarter import com.android.systemui.statusbar.notificationLockscreenUserManager import com.android.systemui.statusbar.policy.keyguardStateController import com.android.systemui.testKosmos -import com.android.systemui.util.mockito.any -import com.android.systemui.util.mockito.eq -import com.android.systemui.util.mockito.mock -import com.android.systemui.util.mockito.whenever import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.test.runTest import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mockito.never import org.mockito.Mockito.verify +import org.mockito.kotlin.any +import org.mockito.kotlin.eq +import org.mockito.kotlin.mock +import org.mockito.kotlin.whenever @SmallTest @RunWith(AndroidJUnit4::class) @@ -121,7 +121,7 @@ class MediaControlInteractorTest : SysuiTestCase() { whenever(kosmos.activityIntentHelper.wouldPendingShowOverLockscreen(any(), any())) .thenReturn(true) - val clickIntent = mock<PendingIntent> { whenever(isActivity).thenReturn(true) } + val clickIntent = mock<PendingIntent> { whenever(it.isActivity).thenReturn(true) } val expandable = mock<Expandable>() underTest.startClickIntent(expandable, clickIntent) @@ -133,7 +133,7 @@ class MediaControlInteractorTest : SysuiTestCase() { fun startClickIntent_hideOverLockscreen() { whenever(keyguardStateController.isShowing).thenReturn(false) - val clickIntent = mock<PendingIntent> { whenever(isActivity).thenReturn(true) } + val clickIntent = mock<PendingIntent> { whenever(it.isActivity).thenReturn(true) } val expandable = mock<Expandable>() val activityController = mock<ActivityTransitionAnimator.Controller>() whenever(expandable.activityTransitionController(any())).thenReturn(activityController) @@ -150,7 +150,7 @@ class MediaControlInteractorTest : SysuiTestCase() { whenever(kosmos.activityIntentHelper.wouldPendingShowOverLockscreen(any(), any())) .thenReturn(true) - val deviceIntent = mock<PendingIntent> { whenever(isActivity).thenReturn(true) } + val deviceIntent = mock<PendingIntent> { whenever(it.isActivity).thenReturn(true) } underTest.startDeviceIntent(deviceIntent) @@ -163,7 +163,7 @@ class MediaControlInteractorTest : SysuiTestCase() { whenever(kosmos.activityIntentHelper.wouldPendingShowOverLockscreen(any(), any())) .thenReturn(true) - val deviceIntent = mock<PendingIntent> { whenever(isActivity).thenReturn(false) } + val deviceIntent = mock<PendingIntent> { whenever(it.isActivity).thenReturn(false) } underTest.startDeviceIntent(deviceIntent) @@ -174,7 +174,7 @@ class MediaControlInteractorTest : SysuiTestCase() { fun startDeviceIntent_hideOverLockscreen() { whenever(keyguardStateController.isShowing).thenReturn(false) - val deviceIntent = mock<PendingIntent> { whenever(isActivity).thenReturn(true) } + val deviceIntent = mock<PendingIntent> { whenever(it.isActivity).thenReturn(true) } underTest.startDeviceIntent(deviceIntent) diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataFilterImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataFilterImplTest.kt index 265ade3fac0f..5986f4a9a9aa 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataFilterImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataFilterImplTest.kt @@ -33,9 +33,6 @@ import com.android.systemui.media.controls.util.MediaFlags import com.android.systemui.media.controls.util.MediaUiEventLogger import com.android.systemui.settings.UserTracker import com.android.systemui.statusbar.NotificationLockscreenUserManager -import com.android.systemui.util.mockito.any -import com.android.systemui.util.mockito.eq -import com.android.systemui.util.mockito.whenever import com.android.systemui.util.time.FakeSystemClock import com.google.common.truth.Truth.assertThat import java.util.concurrent.Executor @@ -50,6 +47,9 @@ import org.mockito.Mockito.never import org.mockito.Mockito.reset import org.mockito.Mockito.verify import org.mockito.MockitoAnnotations +import org.mockito.kotlin.any +import org.mockito.kotlin.eq +import org.mockito.kotlin.whenever private const val KEY = "TEST_KEY" private const val KEY_ALT = "TEST_KEY_2" diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataManagerImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataManagerImplTest.kt index 99bf2db2ff98..3372f06dec22 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataManagerImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataManagerImplTest.kt @@ -66,9 +66,6 @@ import com.android.systemui.res.R import com.android.systemui.statusbar.SbnBuilder import com.android.systemui.tuner.TunerService import com.android.systemui.util.concurrency.FakeExecutor -import com.android.systemui.util.mockito.any -import com.android.systemui.util.mockito.capture -import com.android.systemui.util.mockito.eq import com.android.systemui.util.time.FakeSystemClock import com.google.common.truth.Truth.assertThat import org.junit.After @@ -90,6 +87,9 @@ import org.mockito.Mockito.verifyNoMoreInteractions import org.mockito.Mockito.`when` as whenever import org.mockito.MockitoSession import org.mockito.junit.MockitoJUnit +import org.mockito.kotlin.any +import org.mockito.kotlin.capture +import org.mockito.kotlin.eq import org.mockito.quality.Strictness private const val KEY = "KEY" diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataFilterImplTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataFilterImplTest.kt index 35eefd91bc8e..caaa42fc364c 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataFilterImplTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataFilterImplTest.kt @@ -40,9 +40,6 @@ import com.android.systemui.media.controls.util.MediaUiEventLogger import com.android.systemui.settings.UserTracker import com.android.systemui.statusbar.NotificationLockscreenUserManager import com.android.systemui.testKosmos -import com.android.systemui.util.mockito.any -import com.android.systemui.util.mockito.eq -import com.android.systemui.util.mockito.whenever import com.android.systemui.util.time.FakeSystemClock import com.google.common.truth.Truth.assertThat import java.util.concurrent.Executor @@ -60,6 +57,9 @@ import org.mockito.Mock import org.mockito.Mockito.never import org.mockito.Mockito.verify import org.mockito.MockitoAnnotations +import org.mockito.kotlin.any +import org.mockito.kotlin.eq +import org.mockito.kotlin.whenever private const val KEY = "TEST_KEY" private const val KEY_ALT = "TEST_KEY_2" diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataProcessorTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataProcessorTest.kt index 5791826ab1f9..3bf4173cd7c7 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataProcessorTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataProcessorTest.kt @@ -71,10 +71,6 @@ import com.android.systemui.res.R import com.android.systemui.statusbar.SbnBuilder import com.android.systemui.testKosmos import com.android.systemui.util.concurrency.FakeExecutor -import com.android.systemui.util.mockito.any -import com.android.systemui.util.mockito.capture -import com.android.systemui.util.mockito.eq -import com.android.systemui.util.mockito.whenever import com.android.systemui.util.settings.FakeSettings import com.android.systemui.util.time.FakeSystemClock import com.android.systemui.utils.os.FakeHandler @@ -101,6 +97,10 @@ import org.mockito.Mockito.verify import org.mockito.Mockito.verifyNoMoreInteractions import org.mockito.MockitoSession import org.mockito.junit.MockitoJUnit +import org.mockito.kotlin.any +import org.mockito.kotlin.capture +import org.mockito.kotlin.eq +import org.mockito.kotlin.whenever import org.mockito.quality.Strictness private const val KEY = "KEY" diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDeviceManagerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDeviceManagerTest.kt index befe64c1f411..d2701dd0d3a3 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDeviceManagerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDeviceManagerTest.kt @@ -51,7 +51,6 @@ import com.android.systemui.media.muteawait.MediaMuteAwaitConnectionManagerFacto import com.android.systemui.res.R import com.android.systemui.statusbar.policy.ConfigurationController import com.android.systemui.util.concurrency.FakeExecutor -import com.android.systemui.util.mockito.eq import com.android.systemui.util.time.FakeSystemClock import com.google.common.truth.Truth.assertThat import org.junit.After @@ -72,6 +71,7 @@ import org.mockito.Mockito.verify import org.mockito.Mockito.verifyNoMoreInteractions import org.mockito.Mockito.`when` as whenever import org.mockito.junit.MockitoJUnit +import org.mockito.kotlin.eq private const val KEY = "TEST_KEY" private const val KEY_OLD = "TEST_KEY_OLD" diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaSessionBasedFilterTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaSessionBasedFilterTest.kt index 030bca25c518..31a243591b60 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaSessionBasedFilterTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaSessionBasedFilterTest.kt @@ -27,7 +27,6 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.media.controls.MediaTestUtils import com.android.systemui.media.controls.shared.model.MediaData import com.android.systemui.util.concurrency.FakeExecutor -import com.android.systemui.util.mockito.eq import com.android.systemui.util.time.FakeSystemClock import org.junit.After import org.junit.Before @@ -38,12 +37,13 @@ import org.mockito.ArgumentCaptor import org.mockito.ArgumentMatchers.anyBoolean import org.mockito.ArgumentMatchers.anyInt import org.mockito.Mock -import org.mockito.Mockito.any import org.mockito.Mockito.never import org.mockito.Mockito.reset import org.mockito.Mockito.verify import org.mockito.Mockito.`when` as whenever import org.mockito.junit.MockitoJUnit +import org.mockito.kotlin.any +import org.mockito.kotlin.eq private const val PACKAGE = "PKG" private const val KEY = "TEST_KEY" diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaTimeoutListenerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaTimeoutListenerTest.kt index cdbf9d757ec1..6ca0bef17404 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaTimeoutListenerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaTimeoutListenerTest.kt @@ -31,10 +31,6 @@ import com.android.systemui.media.controls.util.MediaFlags import com.android.systemui.plugins.statusbar.StatusBarStateController import com.android.systemui.statusbar.SysuiStatusBarStateController import com.android.systemui.util.concurrency.FakeExecutor -import com.android.systemui.util.mockito.any -import com.android.systemui.util.mockito.capture -import com.android.systemui.util.mockito.eq -import com.android.systemui.util.mockito.whenever import com.android.systemui.util.time.FakeSystemClock import com.google.common.truth.Truth.assertThat import org.junit.Before @@ -52,6 +48,10 @@ import org.mockito.Mockito.mock import org.mockito.Mockito.never import org.mockito.Mockito.verify import org.mockito.junit.MockitoJUnit +import org.mockito.kotlin.any +import org.mockito.kotlin.capture +import org.mockito.kotlin.eq +import org.mockito.kotlin.whenever private const val KEY = "KEY" private const val PACKAGE = "PKG" diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/controller/MediaCarouselControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/controller/MediaCarouselControllerTest.kt index 3bb8b8fcd775..6f50d0a9d7c4 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/controller/MediaCarouselControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/controller/MediaCarouselControllerTest.kt @@ -60,9 +60,6 @@ import com.android.systemui.statusbar.policy.ConfigurationController import com.android.systemui.testKosmos import com.android.systemui.util.concurrency.DelayableExecutor import com.android.systemui.util.concurrency.FakeExecutor -import com.android.systemui.util.mockito.any -import com.android.systemui.util.mockito.capture -import com.android.systemui.util.mockito.eq import com.android.systemui.util.settings.FakeSettings import com.android.systemui.util.settings.GlobalSettings import com.android.systemui.util.settings.SecureSettings @@ -92,6 +89,9 @@ import org.mockito.Mockito.times import org.mockito.Mockito.verify import org.mockito.Mockito.`when` as whenever import org.mockito.MockitoAnnotations +import org.mockito.kotlin.any +import org.mockito.kotlin.capture +import org.mockito.kotlin.eq private val DATA = MediaTestUtils.emptyMediaData diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/controller/MediaControlPanelTest.kt b/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/controller/MediaControlPanelTest.kt index 0c9fee9e2741..6d7976e6e51d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/controller/MediaControlPanelTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/controller/MediaControlPanelTest.kt @@ -98,11 +98,6 @@ import com.android.systemui.surfaceeffects.turbulencenoise.TurbulenceNoiseAnimat import com.android.systemui.surfaceeffects.turbulencenoise.TurbulenceNoiseView import com.android.systemui.util.animation.TransitionLayout import com.android.systemui.util.concurrency.FakeExecutor -import com.android.systemui.util.mockito.KotlinArgumentCaptor -import com.android.systemui.util.mockito.any -import com.android.systemui.util.mockito.argumentCaptor -import com.android.systemui.util.mockito.eq -import com.android.systemui.util.mockito.withArgCaptor import com.android.systemui.util.settings.GlobalSettings import com.android.systemui.util.time.FakeSystemClock import com.google.common.truth.Truth.assertThat @@ -125,6 +120,9 @@ import org.mockito.Mockito.times import org.mockito.Mockito.verify import org.mockito.Mockito.`when` as whenever import org.mockito.junit.MockitoJUnit +import org.mockito.kotlin.any +import org.mockito.kotlin.argumentCaptor +import org.mockito.kotlin.eq private const val KEY = "TEST_KEY" private const val PACKAGE = "PKG" @@ -247,8 +245,7 @@ public class MediaControlPanelTest : SysuiTestCase() { // Set up package manager mocks val icon = context.getDrawable(R.drawable.ic_android) whenever(packageManager.getApplicationIcon(anyString())).thenReturn(icon) - whenever(packageManager.getApplicationIcon(any(ApplicationInfo::class.java))) - .thenReturn(icon) + whenever(packageManager.getApplicationIcon(any<ApplicationInfo>())).thenReturn(icon) whenever(packageManager.getApplicationInfo(eq(PACKAGE), anyInt())) .thenReturn(applicationInfo) whenever(packageManager.getApplicationLabel(any())).thenReturn(PACKAGE) @@ -644,7 +641,7 @@ public class MediaControlPanelTest : SysuiTestCase() { bgExecutor.runAllReady() mainExecutor.runAllReady() - verify(albumView).setImageDrawable(any(Drawable::class.java)) + verify(albumView).setImageDrawable(any<Drawable>()) } @Test @@ -657,7 +654,7 @@ public class MediaControlPanelTest : SysuiTestCase() { bgExecutor.runAllReady() mainExecutor.runAllReady() - verify(albumView).setImageDrawable(any(Drawable::class.java)) + verify(albumView).setImageDrawable(any<Drawable>()) } @Test @@ -675,12 +672,12 @@ public class MediaControlPanelTest : SysuiTestCase() { player.bindPlayer(state0, PACKAGE) bgExecutor.runAllReady() mainExecutor.runAllReady() - verify(albumView).setImageDrawable(any(Drawable::class.java)) + verify(albumView).setImageDrawable(any<Drawable>()) // Run Metadata update so that later states don't update val captor = argumentCaptor<Animator.AnimatorListener>() verify(mockAnimator, times(2)).addListener(captor.capture()) - captor.value.onAnimationEnd(mockAnimator) + captor.lastValue.onAnimationEnd(mockAnimator) assertThat(titleText.getText()).isEqualTo(TITLE) assertThat(artistText.getText()).isEqualTo(ARTIST) @@ -696,13 +693,13 @@ public class MediaControlPanelTest : SysuiTestCase() { player.bindPlayer(state2, PACKAGE) bgExecutor.runAllReady() mainExecutor.runAllReady() - verify(albumView, times(2)).setImageDrawable(any(Drawable::class.java)) + verify(albumView, times(2)).setImageDrawable(any<Drawable>()) // Fourth binding to new image runs transition due to color scheme change player.bindPlayer(state3, PACKAGE) bgExecutor.runAllReady() mainExecutor.runAllReady() - verify(albumView, times(3)).setImageDrawable(any(Drawable::class.java)) + verify(albumView, times(3)).setImageDrawable(any<Drawable>()) } @Test @@ -974,7 +971,7 @@ public class MediaControlPanelTest : SysuiTestCase() { val captor = argumentCaptor<SeekBarObserver>() verify(seekBarData).observeForever(captor.capture()) - val seekBarObserver = captor.value!! + val seekBarObserver = captor.lastValue // Then the seekbar is set to animate assertThat(seekBarObserver.animationEnabled).isTrue() @@ -1086,27 +1083,19 @@ public class MediaControlPanelTest : SysuiTestCase() { whenever(mockAvd0.isRunning()).thenReturn(false) val captor = ArgumentCaptor.forClass(Animatable2.AnimationCallback::class.java) verify(mockAvd0, times(1)).registerAnimationCallback(captor.capture()) - verify(mockAvd1, never()) - .registerAnimationCallback(any(Animatable2.AnimationCallback::class.java)) - verify(mockAvd2, never()) - .registerAnimationCallback(any(Animatable2.AnimationCallback::class.java)) + verify(mockAvd1, never()).registerAnimationCallback(any<Animatable2.AnimationCallback>()) + verify(mockAvd2, never()).registerAnimationCallback(any<Animatable2.AnimationCallback>()) captor.getValue().onAnimationEnd(mockAvd0) // Validate correct state was bound assertThat(actionPlayPause.contentDescription).isEqualTo("loading") assertThat(actionPlayPause.getBackground()).isNull() - verify(mockAvd0, times(1)) - .registerAnimationCallback(any(Animatable2.AnimationCallback::class.java)) - verify(mockAvd1, times(1)) - .registerAnimationCallback(any(Animatable2.AnimationCallback::class.java)) - verify(mockAvd2, times(1)) - .registerAnimationCallback(any(Animatable2.AnimationCallback::class.java)) - verify(mockAvd0, times(1)) - .unregisterAnimationCallback(any(Animatable2.AnimationCallback::class.java)) - verify(mockAvd1, times(1)) - .unregisterAnimationCallback(any(Animatable2.AnimationCallback::class.java)) - verify(mockAvd2, never()) - .unregisterAnimationCallback(any(Animatable2.AnimationCallback::class.java)) + verify(mockAvd0, times(1)).registerAnimationCallback(any<Animatable2.AnimationCallback>()) + verify(mockAvd1, times(1)).registerAnimationCallback(any<Animatable2.AnimationCallback>()) + verify(mockAvd2, times(1)).registerAnimationCallback(any<Animatable2.AnimationCallback>()) + verify(mockAvd0, times(1)).unregisterAnimationCallback(any<Animatable2.AnimationCallback>()) + verify(mockAvd1, times(1)).unregisterAnimationCallback(any<Animatable2.AnimationCallback>()) + verify(mockAvd2, never()).unregisterAnimationCallback(any<Animatable2.AnimationCallback>()) } @Test @@ -1118,7 +1107,7 @@ public class MediaControlPanelTest : SysuiTestCase() { // Capture animation handler val captor = argumentCaptor<Animator.AnimatorListener>() verify(mockAnimator, times(2)).addListener(captor.capture()) - val handler = captor.value + val handler = captor.lastValue // Validate text views unchanged but animation started assertThat(titleText.getText()).isEqualTo("") @@ -1147,7 +1136,7 @@ public class MediaControlPanelTest : SysuiTestCase() { // Capture animation handler val captor = argumentCaptor<Animator.AnimatorListener>() verify(mockAnimator, times(2)).addListener(captor.capture()) - val handler = captor.value + val handler = captor.lastValue // Validate text views unchanged but animation started assertThat(titleText.getText()).isEqualTo("") @@ -1179,7 +1168,7 @@ public class MediaControlPanelTest : SysuiTestCase() { // Capture animation handler val captor = argumentCaptor<Animator.AnimatorListener>() verify(mockAnimator, times(2)).addListener(captor.capture()) - val handler = captor.value + val handler = captor.lastValue handler.onAnimationEnd(mockAnimator) assertThat(artistText.getText()).isEqualTo("ARTIST_0") @@ -1775,10 +1764,9 @@ public class MediaControlPanelTest : SysuiTestCase() { player.attachPlayer(viewHolder) player.bindPlayer(mediaData, KEY) - val callback: () -> Unit = {} - val captor = KotlinArgumentCaptor(callback::class.java) + val captor = argumentCaptor<() -> Unit>() verify(seekBarViewModel).logSeek = captor.capture() - captor.value.invoke() + captor.lastValue.invoke() verify(logger).logSeek(anyInt(), eq(PACKAGE), eq(instanceId)) } @@ -1801,7 +1789,7 @@ public class MediaControlPanelTest : SysuiTestCase() { // THEN it sends the PendingIntent without dismissing keyguard first, // and does not use the Intent directly (see b/271845008) captor.value.onClick(viewHolder.player) - verify(pendingIntent).send(any(Bundle::class.java)) + verify(pendingIntent).send(any<Bundle>()) verify(pendingIntent, never()).getIntent() verify(activityStarter, never()).postStartActivityDismissingKeyguard(eq(clickIntent), any()) } @@ -2219,8 +2207,8 @@ public class MediaControlPanelTest : SysuiTestCase() { mainExecutor.runAllReady() verify(recCardTitle).setTextColor(any<Int>()) - verify(recAppIconItem, times(3)).setImageDrawable(any(Drawable::class.java)) - verify(coverItem, times(3)).setImageDrawable(any(Drawable::class.java)) + verify(recAppIconItem, times(3)).setImageDrawable(any<Drawable>()) + verify(coverItem, times(3)).setImageDrawable(any<Drawable>()) verify(coverItem, times(3)).imageMatrix = any() } @@ -2547,7 +2535,7 @@ public class MediaControlPanelTest : SysuiTestCase() { seamless.callOnClick() // Then we send the pending intent as is, without modifying the original intent - verify(pendingIntent).send(any(Bundle::class.java)) + verify(pendingIntent).send(any<Bundle>()) verify(pendingIntent, never()).getIntent() } @@ -2579,13 +2567,16 @@ public class MediaControlPanelTest : SysuiTestCase() { return Icon.createWithBitmap(bmp) } - private fun getScrubbingChangeListener(): SeekBarViewModel.ScrubbingChangeListener = - withArgCaptor { - verify(seekBarViewModel).setScrubbingChangeListener(capture()) - } + private fun getScrubbingChangeListener(): SeekBarViewModel.ScrubbingChangeListener { + val captor = argumentCaptor<SeekBarViewModel.ScrubbingChangeListener>() + verify(seekBarViewModel).setScrubbingChangeListener(captor.capture()) + return captor.lastValue + } - private fun getEnabledChangeListener(): SeekBarViewModel.EnabledChangeListener = withArgCaptor { - verify(seekBarViewModel).setEnabledChangeListener(capture()) + private fun getEnabledChangeListener(): SeekBarViewModel.EnabledChangeListener { + val captor = argumentCaptor<SeekBarViewModel.EnabledChangeListener>() + verify(seekBarViewModel).setEnabledChangeListener(captor.capture()) + return captor.lastValue } /** |