Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b29e11c0 authored by Beth Thibodeau's avatar Beth Thibodeau Committed by Android (Google) Code Review
Browse files

Revert^2 "Update media tests to mockito-kotlin" 

This reverts commit cd50db72.

Reason for revert: relanding changes

Change-Id: I0b2a27500a3e39f57e16df65de7b2494b4a46364
parent cd50db72

packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/domain/interactor/MediaControlInteractorTest.kt

+9 −9
Original line number Diff line number Diff line
@@ -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)

packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataFilterImplTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -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"

packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/LegacyMediaDataManagerImplTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -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"

packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataFilterImplTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -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"

packages/SystemUI/tests/src/com/android/systemui/media/controls/domain/pipeline/MediaDataProcessorTest.kt

+4 −4
Original line number Diff line number Diff line
@@ -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"