Merge "In multivalentTests folder, convert Kosmos() to testKosmos()" into main (d7fcfe40) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardUnfoldTransitionTest.kt

+21 −19

Original line number	Diff line number	Diff line
		@@ -22,12 +22,12 @@ import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.customization.R as customR
		import com.android.systemui.keyguard.ui.view.KeyguardRootView
		import com.android.systemui.kosmos.Kosmos
		import com.android.systemui.plugins.statusbar.StatusBarStateController
		import com.android.systemui.res.R
		import com.android.systemui.shade.NotificationShadeWindowView
		import com.android.systemui.statusbar.StatusBarState.KEYGUARD
		import com.android.systemui.statusbar.StatusBarState.SHADE
		import com.android.systemui.testKosmos
		import com.android.systemui.unfold.FakeUnfoldTransitionProvider
		import com.android.systemui.unfold.UnfoldTransitionProgressProvider.TransitionProgressListener
		import com.android.systemui.unfold.fakeUnfoldTransitionProgressProvider
		@@ -47,16 +47,14 @@ import org.mockito.kotlin.whenever
		@RunWith(AndroidJUnit4::class)
		class KeyguardUnfoldTransitionTest : SysuiTestCase() {

		private val kosmos = Kosmos()
		private val kosmos = testKosmos()

		private val progressProvider: FakeUnfoldTransitionProvider =
		kosmos.fakeUnfoldTransitionProgressProvider

		@Mock
		private lateinit var keyguardRootView: KeyguardRootView
		@Mock private lateinit var keyguardRootView: KeyguardRootView

		@Mock
		private lateinit var notificationShadeWindowView: NotificationShadeWindowView
		@Mock private lateinit var notificationShadeWindowView: NotificationShadeWindowView

		@Mock private lateinit var statusBarStateController: StatusBarStateController

		@@ -71,9 +69,13 @@ class KeyguardUnfoldTransitionTest : SysuiTestCase() {
		xTranslationMax =
		context.resources.getDimensionPixelSize(R.dimen.keyguard_unfold_translation_x).toFloat()

		underTest = KeyguardUnfoldTransition(
		context, keyguardRootView, notificationShadeWindowView,
		statusBarStateController, progressProvider
		underTest =
		KeyguardUnfoldTransition(
		context,
		keyguardRootView,
		notificationShadeWindowView,
		statusBarStateController,
		progressProvider,
		)

		underTest.setup()
		@@ -88,9 +90,8 @@ class KeyguardUnfoldTransitionTest : SysuiTestCase() {
		underTest.statusViewCentered = true

		val view = View(context)
		whenever(keyguardRootView.findViewById<View>(customR.id.lockscreen_clock_view_large)).thenReturn(
		view
		)
		whenever(keyguardRootView.findViewById<View>(customR.id.lockscreen_clock_view_large))
		.thenReturn(view)

		progressListener.onTransitionStarted()
		assertThat(view.translationX).isZero()
		@@ -110,9 +111,8 @@ class KeyguardUnfoldTransitionTest : SysuiTestCase() {
		whenever(statusBarStateController.getState()).thenReturn(SHADE)

		val view = View(context)
		whenever(keyguardRootView.findViewById<View>(customR.id.lockscreen_clock_view_large)).thenReturn(
		view
		)
		whenever(keyguardRootView.findViewById<View>(customR.id.lockscreen_clock_view_large))
		.thenReturn(view)

		progressListener.onTransitionStarted()
		assertThat(view.translationX).isZero()
		@@ -133,9 +133,11 @@ class KeyguardUnfoldTransitionTest : SysuiTestCase() {

		val view = View(context)
		whenever(
		notificationShadeWindowView
		.findViewById<View>(customR.id.lockscreen_clock_view_large)
		).thenReturn(view)
		notificationShadeWindowView.findViewById<View>(
		customR.id.lockscreen_clock_view_large
		)
		)
		.thenReturn(view)

		progressListener.onTransitionStarted()
		assertThat(view.translationX).isZero()

packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/extradim/ExtraDimDialogDelegateTest.kt

+5 −5

Original line number	Diff line number	Diff line
		@@ -23,7 +23,6 @@ import androidx.test.filters.SmallTest
		import com.android.internal.accessibility.AccessibilityShortcutController
		import com.android.internal.accessibility.common.ShortcutConstants
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.kosmos.Kosmos
		import com.android.systemui.kosmos.testCase
		import com.android.systemui.kosmos.testDispatcher
		import com.android.systemui.kosmos.testScope
		@@ -31,6 +30,7 @@ import com.android.systemui.model.SysUiState
		import com.android.systemui.res.R
		import com.android.systemui.settings.UserTracker
		import com.android.systemui.statusbar.phone.SystemUIDialog
		import com.android.systemui.testKosmos
		import kotlinx.coroutines.test.advanceUntilIdle
		import kotlinx.coroutines.test.runCurrent
		import kotlinx.coroutines.test.runTest
		@@ -58,7 +58,7 @@ class ExtraDimDialogDelegateTest : SysuiTestCase() {

		private lateinit var extraDimDialogDelegate: ExtraDimDialogDelegate

		private val kosmos = Kosmos().also { it.testCase = this }
		private val kosmos = testKosmos().also { it.testCase = this }
		private val testScope = kosmos.testScope

		@Mock private lateinit var dialog: SystemUIDialog
		@@ -79,7 +79,7 @@ class ExtraDimDialogDelegateTest : SysuiTestCase() {
		kosmos.testDispatcher,
		dialogFactory,
		accessibilityManager,
		userTracker
		userTracker,
		)
		}

		@@ -94,7 +94,7 @@ class ExtraDimDialogDelegateTest : SysuiTestCase() {
		verify(dialog)
		.setPositiveButton(
		eq(R.string.accessibility_deprecate_extra_dim_dialog_button),
		clickListener.capture()
		clickListener.capture(),
		)

		clickListener.firstValue.onClick(dialog, 0)
		@@ -110,7 +110,7 @@ class ExtraDimDialogDelegateTest : SysuiTestCase() {
		.flattenToString()
		)
		),
		anyInt()
		anyInt(),
		)
		}
		}

packages/SystemUI/multivalentTests/src/com/android/systemui/back/domain/interactor/BackActionInteractorTest.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -32,7 +32,6 @@ import com.android.internal.statusbar.IStatusBarService
		import com.android.systemui.Flags
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository
		import com.android.systemui.kosmos.Kosmos
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.plugins.statusbar.StatusBarStateController
		import com.android.systemui.power.domain.interactor.PowerInteractor.Companion.setAsleepForTest
		@@ -50,6 +49,7 @@ import com.android.systemui.statusbar.StatusBarState
		import com.android.systemui.statusbar.notification.domain.interactor.activeNotificationsInteractor
		import com.android.systemui.statusbar.notification.headsup.HeadsUpManager
		import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager
		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.argumentCaptor
		@@ -74,7 +74,7 @@ import org.mockito.junit.MockitoJUnit
		@SmallTest
		@RunWith(AndroidJUnit4::class)
		class BackActionInteractorTest : SysuiTestCase() {
		private val kosmos = Kosmos()
		private val kosmos = testKosmos()
		private val testScope = kosmos.testScope
		private val executor = FakeExecutor(FakeSystemClock())

packages/SystemUI/multivalentTests/src/com/android/systemui/camera/data/repository/CameraAutoRotateRepositoryImplTest.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -22,8 +22,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.coroutines.collectValues
		import com.android.systemui.kosmos.Kosmos
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.testKosmos
		import com.android.systemui.util.settings.fakeSettings
		import com.google.common.truth.Truth.assertThat
		import kotlinx.coroutines.test.runCurrent
		@@ -34,7 +34,7 @@ import org.junit.runner.RunWith
		@SmallTest
		@RunWith(AndroidJUnit4::class)
		class CameraAutoRotateRepositoryImplTest : SysuiTestCase() {
		private val kosmos = Kosmos()
		private val kosmos = testKosmos()
		private val testScope = kosmos.testScope
		private val settings = kosmos.fakeSettings
		private val testUser = UserHandle.of(1)

packages/SystemUI/multivalentTests/src/com/android/systemui/camera/data/repository/CameraSensorPrivacyRepositoryImplTest.kt

+4 −4

Original line number	Diff line number	Diff line
		@@ -22,8 +22,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.coroutines.collectLastValue
		import com.android.systemui.kosmos.Kosmos
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.testKosmos
		import com.android.systemui.util.mockito.mock
		import com.google.common.truth.Truth.assertThat
		import kotlinx.coroutines.test.runCurrent
		@@ -38,7 +38,7 @@ import org.mockito.Mockito
		@RunWith(AndroidJUnit4::class)
		@android.platform.test.annotations.EnabledOnRavenwood
		class CameraSensorPrivacyRepositoryImplTest : SysuiTestCase() {
		private val kosmos = Kosmos()
		private val kosmos = testKosmos()
		private val testScope = kosmos.testScope
		private val testUser = UserHandle.of(1)
		private val privacyManager = mock<SensorPrivacyManager>()
		@@ -46,7 +46,7 @@ class CameraSensorPrivacyRepositoryImplTest : SysuiTestCase() {
		CameraSensorPrivacyRepositoryImpl(
		testScope.testScheduler,
		testScope.backgroundScope,
		privacyManager
		privacyManager,
		)

		@Test
		@@ -87,7 +87,7 @@ class CameraSensorPrivacyRepositoryImplTest : SysuiTestCase() {
		.addSensorPrivacyListener(
		ArgumentMatchers.eq(SensorPrivacyManager.Sensors.CAMERA),
		ArgumentMatchers.eq(testUser.identifier),
		captor.capture()
		captor.capture(),
		)
		val sensorPrivacyCallback = captor.value!!