Merge "[1/3] Rename OngoingActivityChipModel types to Active/Inactive." into main (f242aad2) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/call/ui/viewmodel/CallChipViewModelTest.kt

+32 −32

Original line number	Original line	Diff line number	Diff line
	@@ -88,7 +88,7 @@ class CallChipViewModelTest : SysuiTestCase() {

	repo.setOngoingCallState(OngoingCallModel.NoCall)		repo.setOngoingCallState(OngoingCallModel.NoCall)

	assertThat(latest).isInstanceOf(OngoingActivityChipModel.Hidden::class.java)		assertThat(latest).isInstanceOf(OngoingActivityChipModel.Inactive::class.java)
	}		}

	@Test		@Test
	@@ -98,7 +98,7 @@ class CallChipViewModelTest : SysuiTestCase() {

	repo.setOngoingCallState(inCallModel(startTimeMs = 0))		repo.setOngoingCallState(inCallModel(startTimeMs = 0))

	assertThat(latest).isInstanceOf(OngoingActivityChipModel.Shown.IconOnly::class.java)		assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active.IconOnly::class.java)
	}		}

	@Test		@Test
	@@ -108,7 +108,7 @@ class CallChipViewModelTest : SysuiTestCase() {

	repo.setOngoingCallState(inCallModel(startTimeMs = -2))		repo.setOngoingCallState(inCallModel(startTimeMs = -2))

	assertThat(latest).isInstanceOf(OngoingActivityChipModel.Shown.IconOnly::class.java)		assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active.IconOnly::class.java)
	}		}

	@Test		@Test
	@@ -118,7 +118,7 @@ class CallChipViewModelTest : SysuiTestCase() {

	repo.setOngoingCallState(inCallModel(startTimeMs = 345))		repo.setOngoingCallState(inCallModel(startTimeMs = 345))

	assertThat(latest).isInstanceOf(OngoingActivityChipModel.Shown.Timer::class.java)		assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active.Timer::class.java)
	}		}

	@Test		@Test
	@@ -135,7 +135,7 @@ class CallChipViewModelTest : SysuiTestCase() {
	// started 2000ms ago (1000 - 3000). The OngoingActivityChipModel start time needs to be		// started 2000ms ago (1000 - 3000). The OngoingActivityChipModel start time needs to be
	// relative to elapsedRealtime, so it should be 2000ms before the elapsed realtime set		// relative to elapsedRealtime, so it should be 2000ms before the elapsed realtime set
	// on the clock.		// on the clock.
	assertThat((latest as OngoingActivityChipModel.Shown.Timer).startTimeMs)		assertThat((latest as OngoingActivityChipModel.Active.Timer).startTimeMs)
	.isEqualTo(398_000)		.isEqualTo(398_000)
	}		}

	@@ -150,12 +150,12 @@ class CallChipViewModelTest : SysuiTestCase() {
	inCallModel(startTimeMs = 1000, notificationIcon = null, notificationKey = notifKey)		inCallModel(startTimeMs = 1000, notificationIcon = null, notificationKey = notifKey)
	)		)

	assertThat((latest as OngoingActivityChipModel.Shown).icon)		assertThat((latest as OngoingActivityChipModel.Active).icon)
	.isInstanceOf(		.isInstanceOf(
	OngoingActivityChipModel.ChipIcon.StatusBarNotificationIcon::class.java		OngoingActivityChipModel.ChipIcon.StatusBarNotificationIcon::class.java
	)		)
	val actualNotifKey =		val actualNotifKey =
	(((latest as OngoingActivityChipModel.Shown).icon)		(((latest as OngoingActivityChipModel.Active).icon)
	as OngoingActivityChipModel.ChipIcon.StatusBarNotificationIcon)		as OngoingActivityChipModel.ChipIcon.StatusBarNotificationIcon)
	.notificationKey		.notificationKey
	assertThat(actualNotifKey).isEqualTo(notifKey)		assertThat(actualNotifKey).isEqualTo(notifKey)
	@@ -176,10 +176,10 @@ class CallChipViewModelTest : SysuiTestCase() {
	)		)
	)		)

	assertThat((latest as OngoingActivityChipModel.Shown).icon)		assertThat((latest as OngoingActivityChipModel.Active).icon)
	.isInstanceOf(OngoingActivityChipModel.ChipIcon.StatusBarView::class.java)		.isInstanceOf(OngoingActivityChipModel.ChipIcon.StatusBarView::class.java)
	val actualIcon =		val actualIcon =
	(latest as OngoingActivityChipModel.Shown).icon		(latest as OngoingActivityChipModel.Active).icon
	as OngoingActivityChipModel.ChipIcon.StatusBarView		as OngoingActivityChipModel.ChipIcon.StatusBarView
	assertThat(actualIcon.impl).isEqualTo(notifIcon)		assertThat(actualIcon.impl).isEqualTo(notifIcon)
	assertThat(actualIcon.contentDescription.loadContentDescription(context))		assertThat(actualIcon.contentDescription.loadContentDescription(context))
	@@ -203,12 +203,12 @@ class CallChipViewModelTest : SysuiTestCase() {
	)		)
	)		)

	assertThat((latest as OngoingActivityChipModel.Shown).icon)		assertThat((latest as OngoingActivityChipModel.Active).icon)
	.isInstanceOf(		.isInstanceOf(
	OngoingActivityChipModel.ChipIcon.StatusBarNotificationIcon::class.java		OngoingActivityChipModel.ChipIcon.StatusBarNotificationIcon::class.java
	)		)
	val actualIcon =		val actualIcon =
	(latest as OngoingActivityChipModel.Shown).icon		(latest as OngoingActivityChipModel.Active).icon
	as OngoingActivityChipModel.ChipIcon.StatusBarNotificationIcon		as OngoingActivityChipModel.ChipIcon.StatusBarNotificationIcon
	assertThat(actualIcon.notificationKey).isEqualTo("notifKey")		assertThat(actualIcon.notificationKey).isEqualTo("notifKey")
	assertThat(actualIcon.contentDescription.loadContentDescription(context))		assertThat(actualIcon.contentDescription.loadContentDescription(context))
	@@ -225,10 +225,10 @@ class CallChipViewModelTest : SysuiTestCase() {

	repo.setOngoingCallState(inCallModel(startTimeMs = 1000, notificationIcon = null))		repo.setOngoingCallState(inCallModel(startTimeMs = 1000, notificationIcon = null))

	assertThat((latest as OngoingActivityChipModel.Shown).icon)		assertThat((latest as OngoingActivityChipModel.Active).icon)
	.isInstanceOf(OngoingActivityChipModel.ChipIcon.SingleColorIcon::class.java)		.isInstanceOf(OngoingActivityChipModel.ChipIcon.SingleColorIcon::class.java)
	val icon =		val icon =
	(((latest as OngoingActivityChipModel.Shown).icon)		(((latest as OngoingActivityChipModel.Active).icon)
	as OngoingActivityChipModel.ChipIcon.SingleColorIcon)		as OngoingActivityChipModel.ChipIcon.SingleColorIcon)
	.impl as Icon.Resource		.impl as Icon.Resource
	assertThat(icon.res).isEqualTo(com.android.internal.R.drawable.ic_phone)		assertThat(icon.res).isEqualTo(com.android.internal.R.drawable.ic_phone)
	@@ -250,12 +250,12 @@ class CallChipViewModelTest : SysuiTestCase() {
	)		)
	)		)

	assertThat((latest as OngoingActivityChipModel.Shown).icon)		assertThat((latest as OngoingActivityChipModel.Active).icon)
	.isInstanceOf(		.isInstanceOf(
	OngoingActivityChipModel.ChipIcon.StatusBarNotificationIcon::class.java		OngoingActivityChipModel.ChipIcon.StatusBarNotificationIcon::class.java
	)		)
	val actualIcon =		val actualIcon =
	(latest as OngoingActivityChipModel.Shown).icon		(latest as OngoingActivityChipModel.Active).icon
	as OngoingActivityChipModel.ChipIcon.StatusBarNotificationIcon		as OngoingActivityChipModel.ChipIcon.StatusBarNotificationIcon
	assertThat(actualIcon.notificationKey).isEqualTo("notifKey")		assertThat(actualIcon.notificationKey).isEqualTo("notifKey")
	assertThat(actualIcon.contentDescription.loadContentDescription(context))		assertThat(actualIcon.contentDescription.loadContentDescription(context))
	@@ -271,7 +271,7 @@ class CallChipViewModelTest : SysuiTestCase() {

	repo.setOngoingCallState(inCallModel(startTimeMs = 1000, promotedContent = null))		repo.setOngoingCallState(inCallModel(startTimeMs = 1000, promotedContent = null))

	assertThat((latest as OngoingActivityChipModel.Shown).colors)		assertThat((latest as OngoingActivityChipModel.Active).colors)
	.isEqualTo(ColorsModel.Themed)		.isEqualTo(ColorsModel.Themed)
	}		}

	@@ -282,7 +282,7 @@ class CallChipViewModelTest : SysuiTestCase() {

	repo.setOngoingCallState(inCallModel(startTimeMs = 0, promotedContent = null))		repo.setOngoingCallState(inCallModel(startTimeMs = 0, promotedContent = null))

	assertThat((latest as OngoingActivityChipModel.Shown).colors)		assertThat((latest as OngoingActivityChipModel.Active).colors)
	.isEqualTo(ColorsModel.Themed)		.isEqualTo(ColorsModel.Themed)
	}		}

	@@ -296,7 +296,7 @@ class CallChipViewModelTest : SysuiTestCase() {
	inCallModel(startTimeMs = 1000, promotedContent = PROMOTED_CONTENT_WITH_COLOR)		inCallModel(startTimeMs = 1000, promotedContent = PROMOTED_CONTENT_WITH_COLOR)
	)		)

	assertThat((latest as OngoingActivityChipModel.Shown).colors)		assertThat((latest as OngoingActivityChipModel.Active).colors)
	.isEqualTo(ColorsModel.Themed)		.isEqualTo(ColorsModel.Themed)
	}		}

	@@ -310,7 +310,7 @@ class CallChipViewModelTest : SysuiTestCase() {
	inCallModel(startTimeMs = 0, promotedContent = PROMOTED_CONTENT_WITH_COLOR)		inCallModel(startTimeMs = 0, promotedContent = PROMOTED_CONTENT_WITH_COLOR)
	)		)

	assertThat((latest as OngoingActivityChipModel.Shown).colors)		assertThat((latest as OngoingActivityChipModel.Active).colors)
	.isEqualTo(ColorsModel.Themed)		.isEqualTo(ColorsModel.Themed)
	}		}

	@@ -324,7 +324,7 @@ class CallChipViewModelTest : SysuiTestCase() {
	inCallModel(startTimeMs = 1000, promotedContent = PROMOTED_CONTENT_WITH_COLOR)		inCallModel(startTimeMs = 1000, promotedContent = PROMOTED_CONTENT_WITH_COLOR)
	)		)

	assertThat((latest as OngoingActivityChipModel.Shown).colors)		assertThat((latest as OngoingActivityChipModel.Active).colors)
	.isEqualTo(		.isEqualTo(
	ColorsModel.Custom(		ColorsModel.Custom(
	backgroundColorInt = PROMOTED_BACKGROUND_COLOR,		backgroundColorInt = PROMOTED_BACKGROUND_COLOR,
	@@ -343,7 +343,7 @@ class CallChipViewModelTest : SysuiTestCase() {
	inCallModel(startTimeMs = 0, promotedContent = PROMOTED_CONTENT_WITH_COLOR)		inCallModel(startTimeMs = 0, promotedContent = PROMOTED_CONTENT_WITH_COLOR)
	)		)

	assertThat((latest as OngoingActivityChipModel.Shown).colors)		assertThat((latest as OngoingActivityChipModel.Active).colors)
	.isEqualTo(		.isEqualTo(
	ColorsModel.Custom(		ColorsModel.Custom(
	backgroundColorInt = PROMOTED_BACKGROUND_COLOR,		backgroundColorInt = PROMOTED_BACKGROUND_COLOR,
	@@ -361,13 +361,13 @@ class CallChipViewModelTest : SysuiTestCase() {

	// Start a call		// Start a call
	repo.setOngoingCallState(inCallModel(startTimeMs = 1000))		repo.setOngoingCallState(inCallModel(startTimeMs = 1000))
	assertThat(latest).isInstanceOf(OngoingActivityChipModel.Shown::class.java)		assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active::class.java)
	assertThat((latest as OngoingActivityChipModel.Shown.Timer).startTimeMs)		assertThat((latest as OngoingActivityChipModel.Active.Timer).startTimeMs)
	.isEqualTo(398_000)		.isEqualTo(398_000)

	// End the call		// End the call
	repo.setOngoingCallState(OngoingCallModel.NoCall)		repo.setOngoingCallState(OngoingCallModel.NoCall)
	assertThat(latest).isInstanceOf(OngoingActivityChipModel.Hidden::class.java)		assertThat(latest).isInstanceOf(OngoingActivityChipModel.Inactive::class.java)

	// Let 100_000ms elapse		// Let 100_000ms elapse
	kosmos.fakeSystemClock.setCurrentTimeMillis(103_000)		kosmos.fakeSystemClock.setCurrentTimeMillis(103_000)
	@@ -375,8 +375,8 @@ class CallChipViewModelTest : SysuiTestCase() {

	// Start a new call, which started 1000ms ago		// Start a new call, which started 1000ms ago
	repo.setOngoingCallState(inCallModel(startTimeMs = 102_000))		repo.setOngoingCallState(inCallModel(startTimeMs = 102_000))
	assertThat(latest).isInstanceOf(OngoingActivityChipModel.Shown::class.java)		assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active::class.java)
	assertThat((latest as OngoingActivityChipModel.Shown.Timer).startTimeMs)		assertThat((latest as OngoingActivityChipModel.Active.Timer).startTimeMs)
	.isEqualTo(499_000)		.isEqualTo(499_000)
	}		}

	@@ -388,7 +388,7 @@ class CallChipViewModelTest : SysuiTestCase() {

	repo.setOngoingCallState(inCallModel(startTimeMs = 1000, intent = null))		repo.setOngoingCallState(inCallModel(startTimeMs = 1000, intent = null))

	assertThat((latest as OngoingActivityChipModel.Shown).onClickListenerLegacy).isNull()		assertThat((latest as OngoingActivityChipModel.Active).onClickListenerLegacy).isNull()
	}		}

	@Test		@Test
	@@ -399,7 +399,7 @@ class CallChipViewModelTest : SysuiTestCase() {

	val pendingIntent = mock<PendingIntent>()		val pendingIntent = mock<PendingIntent>()
	repo.setOngoingCallState(inCallModel(startTimeMs = 1000, intent = pendingIntent))		repo.setOngoingCallState(inCallModel(startTimeMs = 1000, intent = pendingIntent))
	val clickListener = (latest as OngoingActivityChipModel.Shown).onClickListenerLegacy		val clickListener = (latest as OngoingActivityChipModel.Active).onClickListenerLegacy
	assertThat(clickListener).isNotNull()		assertThat(clickListener).isNotNull()

	clickListener!!.onClick(chipView)		clickListener!!.onClick(chipView)
	@@ -417,7 +417,7 @@ class CallChipViewModelTest : SysuiTestCase() {

	val pendingIntent = mock<PendingIntent>()		val pendingIntent = mock<PendingIntent>()
	repo.setOngoingCallState(inCallModel(startTimeMs = 0, intent = pendingIntent))		repo.setOngoingCallState(inCallModel(startTimeMs = 0, intent = pendingIntent))
	val clickListener = (latest as OngoingActivityChipModel.Shown).onClickListenerLegacy		val clickListener = (latest as OngoingActivityChipModel.Active).onClickListenerLegacy

	assertThat(clickListener).isNotNull()		assertThat(clickListener).isNotNull()

	@@ -440,7 +440,7 @@ class CallChipViewModelTest : SysuiTestCase() {
	intent = null,		intent = null,
	)		)

	assertThat((latest as OngoingActivityChipModel.Shown).clickBehavior)		assertThat((latest as OngoingActivityChipModel.Active).clickBehavior)
	.isInstanceOf(OngoingActivityChipModel.ClickBehavior.None::class.java)		.isInstanceOf(OngoingActivityChipModel.ClickBehavior.None::class.java)
	}		}

	@@ -457,7 +457,7 @@ class CallChipViewModelTest : SysuiTestCase() {
	intent = pendingIntent,		intent = pendingIntent,
	)		)

	val clickBehavior = (latest as OngoingActivityChipModel.Shown).clickBehavior		val clickBehavior = (latest as OngoingActivityChipModel.Active).clickBehavior
	assertThat(clickBehavior)		assertThat(clickBehavior)
	.isInstanceOf(OngoingActivityChipModel.ClickBehavior.ExpandAction::class.java)		.isInstanceOf(OngoingActivityChipModel.ClickBehavior.ExpandAction::class.java)
	(clickBehavior as OngoingActivityChipModel.ClickBehavior.ExpandAction).onClick(		(clickBehavior as OngoingActivityChipModel.ClickBehavior.ExpandAction).onClick(
	@@ -482,7 +482,7 @@ class CallChipViewModelTest : SysuiTestCase() {
	intent = pendingIntent,		intent = pendingIntent,
	)		)

	val clickBehavior = (latest as OngoingActivityChipModel.Shown).clickBehavior		val clickBehavior = (latest as OngoingActivityChipModel.Active).clickBehavior
	assertThat(clickBehavior)		assertThat(clickBehavior)
	.isInstanceOf(OngoingActivityChipModel.ClickBehavior.ExpandAction::class.java)		.isInstanceOf(OngoingActivityChipModel.ClickBehavior.ExpandAction::class.java)
	(clickBehavior as OngoingActivityChipModel.ClickBehavior.ExpandAction).onClick(		(clickBehavior as OngoingActivityChipModel.ClickBehavior.ExpandAction).onClick(

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/casttootherdevice/ui/viewmodel/CastToOtherDeviceChipViewModelTest.kt

+44 −40

Original line number	Original line	Diff line number	Diff line
	@@ -119,7 +119,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {

	mediaProjectionRepo.mediaProjectionState.value = MediaProjectionState.NotProjecting		mediaProjectionRepo.mediaProjectionState.value = MediaProjectionState.NotProjecting

	assertThat(latest).isInstanceOf(OngoingActivityChipModel.Hidden::class.java)		assertThat(latest).isInstanceOf(OngoingActivityChipModel.Inactive::class.java)
	}		}

	@Test		@Test
	@@ -135,9 +135,9 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {
	createTask(taskId = 1),		createTask(taskId = 1),
	)		)

	assertThat(latest).isInstanceOf(OngoingActivityChipModel.Shown.Timer::class.java)		assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active.Timer::class.java)
	val icon =		val icon =
	(((latest as OngoingActivityChipModel.Shown).icon)		(((latest as OngoingActivityChipModel.Active).icon)
	as OngoingActivityChipModel.ChipIcon.SingleColorIcon)		as OngoingActivityChipModel.ChipIcon.SingleColorIcon)
	.impl as Icon.Resource		.impl as Icon.Resource
	assertThat(icon.res).isEqualTo(R.drawable.ic_cast_connected)		assertThat(icon.res).isEqualTo(R.drawable.ic_cast_connected)
	@@ -157,9 +157,9 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {
	hostPackage = CAST_TO_OTHER_DEVICES_PACKAGE		hostPackage = CAST_TO_OTHER_DEVICES_PACKAGE
	)		)

	assertThat(latest).isInstanceOf(OngoingActivityChipModel.Shown.IconOnly::class.java)		assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active.IconOnly::class.java)
	val icon =		val icon =
	(((latest as OngoingActivityChipModel.Shown).icon)		(((latest as OngoingActivityChipModel.Active).icon)
	as OngoingActivityChipModel.ChipIcon.SingleColorIcon)		as OngoingActivityChipModel.ChipIcon.SingleColorIcon)
	.impl as Icon.Resource		.impl as Icon.Resource
	assertThat(icon.res).isEqualTo(R.drawable.ic_cast_connected)		assertThat(icon.res).isEqualTo(R.drawable.ic_cast_connected)
	@@ -177,9 +177,9 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {
	mediaProjectionRepo.mediaProjectionState.value =		mediaProjectionRepo.mediaProjectionState.value =
	MediaProjectionState.Projecting.EntireScreen(CAST_TO_OTHER_DEVICES_PACKAGE)		MediaProjectionState.Projecting.EntireScreen(CAST_TO_OTHER_DEVICES_PACKAGE)

	assertThat(latest).isInstanceOf(OngoingActivityChipModel.Shown.Timer::class.java)		assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active.Timer::class.java)
	val icon =		val icon =
	(((latest as OngoingActivityChipModel.Shown).icon)		(((latest as OngoingActivityChipModel.Active).icon)
	as OngoingActivityChipModel.ChipIcon.SingleColorIcon)		as OngoingActivityChipModel.ChipIcon.SingleColorIcon)
	.impl as Icon.Resource		.impl as Icon.Resource
	assertThat(icon.res).isEqualTo(R.drawable.ic_cast_connected)		assertThat(icon.res).isEqualTo(R.drawable.ic_cast_connected)
	@@ -195,7 +195,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {

	mediaRouterRepo.castDevices.value = emptyList()		mediaRouterRepo.castDevices.value = emptyList()

	assertThat(latest).isInstanceOf(OngoingActivityChipModel.Hidden::class.java)		assertThat(latest).isInstanceOf(OngoingActivityChipModel.Inactive::class.java)
	}		}

	@Test		@Test
	@@ -215,9 +215,9 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {
	)		)
	)		)

	assertThat(latest).isInstanceOf(OngoingActivityChipModel.Shown.IconOnly::class.java)		assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active.IconOnly::class.java)
	val icon =		val icon =
	(((latest as OngoingActivityChipModel.Shown).icon)		(((latest as OngoingActivityChipModel.Active).icon)
	as OngoingActivityChipModel.ChipIcon.SingleColorIcon)		as OngoingActivityChipModel.ChipIcon.SingleColorIcon)
	.impl as Icon.Resource		.impl as Icon.Resource
	assertThat(icon.res).isEqualTo(R.drawable.ic_cast_connected)		assertThat(icon.res).isEqualTo(R.drawable.ic_cast_connected)
	@@ -245,9 +245,9 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {
	)		)

	// Only the projection info will show a timer		// Only the projection info will show a timer
	assertThat(latest).isInstanceOf(OngoingActivityChipModel.Shown.Timer::class.java)		assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active.Timer::class.java)
	val icon =		val icon =
	(((latest as OngoingActivityChipModel.Shown).icon)		(((latest as OngoingActivityChipModel.Active).icon)
	as OngoingActivityChipModel.ChipIcon.SingleColorIcon)		as OngoingActivityChipModel.ChipIcon.SingleColorIcon)
	.impl as Icon.Resource		.impl as Icon.Resource
	assertThat(icon.res).isEqualTo(R.drawable.ic_cast_connected)		assertThat(icon.res).isEqualTo(R.drawable.ic_cast_connected)
	@@ -265,7 +265,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {
	mediaProjectionRepo.mediaProjectionState.value =		mediaProjectionRepo.mediaProjectionState.value =
	MediaProjectionState.Projecting.EntireScreen(CAST_TO_OTHER_DEVICES_PACKAGE)		MediaProjectionState.Projecting.EntireScreen(CAST_TO_OTHER_DEVICES_PACKAGE)

	assertThat(latest).isInstanceOf(OngoingActivityChipModel.Shown::class.java)		assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active::class.java)

	// WHEN the stop action on the dialog is clicked		// WHEN the stop action on the dialog is clicked
	val dialogStopAction =		val dialogStopAction =
	@@ -279,13 +279,13 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {
	dialogStopAction.onClick(mock<DialogInterface>(), 0)		dialogStopAction.onClick(mock<DialogInterface>(), 0)

	// THEN the chip is immediately hidden...		// THEN the chip is immediately hidden...
	assertThat(latest).isInstanceOf(OngoingActivityChipModel.Hidden::class.java)		assertThat(latest).isInstanceOf(OngoingActivityChipModel.Inactive::class.java)
	// ...even though the repo still says it's projecting		// ...even though the repo still says it's projecting
	assertThat(mediaProjectionRepo.mediaProjectionState.value)		assertThat(mediaProjectionRepo.mediaProjectionState.value)
	.isInstanceOf(MediaProjectionState.Projecting::class.java)		.isInstanceOf(MediaProjectionState.Projecting::class.java)

	// AND we specify no animation		// AND we specify no animation
	assertThat((latest as OngoingActivityChipModel.Hidden).shouldAnimate).isFalse()		assertThat((latest as OngoingActivityChipModel.Inactive).shouldAnimate).isFalse()
	}		}

	@Test		@Test
	@@ -304,7 +304,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {
	)		)
	)		)

	assertThat(latest).isInstanceOf(OngoingActivityChipModel.Shown::class.java)		assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active::class.java)

	// WHEN the stop action on the dialog is clicked		// WHEN the stop action on the dialog is clicked
	val dialogStopAction =		val dialogStopAction =
	@@ -318,12 +318,12 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {
	dialogStopAction.onClick(mock<DialogInterface>(), 0)		dialogStopAction.onClick(mock<DialogInterface>(), 0)

	// THEN the chip is immediately hidden...		// THEN the chip is immediately hidden...
	assertThat(latest).isInstanceOf(OngoingActivityChipModel.Hidden::class.java)		assertThat(latest).isInstanceOf(OngoingActivityChipModel.Inactive::class.java)
	// ...even though the repo still says it's projecting		// ...even though the repo still says it's projecting
	assertThat(mediaRouterRepo.castDevices.value).isNotEmpty()		assertThat(mediaRouterRepo.castDevices.value).isNotEmpty()

	// AND we specify no animation		// AND we specify no animation
	assertThat((latest as OngoingActivityChipModel.Hidden).shouldAnimate).isFalse()		assertThat((latest as OngoingActivityChipModel.Inactive).shouldAnimate).isFalse()
	}		}

	@Test		@Test
	@@ -334,7 +334,8 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {
	mediaProjectionRepo.mediaProjectionState.value =		mediaProjectionRepo.mediaProjectionState.value =
	MediaProjectionState.Projecting.EntireScreen(CAST_TO_OTHER_DEVICES_PACKAGE)		MediaProjectionState.Projecting.EntireScreen(CAST_TO_OTHER_DEVICES_PACKAGE)

	assertThat((latest as OngoingActivityChipModel.Shown).colors).isEqualTo(ColorsModel.Red)		assertThat((latest as OngoingActivityChipModel.Active).colors)
			.isEqualTo(ColorsModel.Red)
	}		}

	@Test		@Test
	@@ -346,7 +347,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {
	mediaProjectionRepo.mediaProjectionState.value =		mediaProjectionRepo.mediaProjectionState.value =
	MediaProjectionState.Projecting.NoScreen(NORMAL_PACKAGE)		MediaProjectionState.Projecting.NoScreen(NORMAL_PACKAGE)

	assertThat(latest).isInstanceOf(OngoingActivityChipModel.Hidden::class.java)		assertThat(latest).isInstanceOf(OngoingActivityChipModel.Inactive::class.java)
	}		}

	@Test		@Test
	@@ -361,7 +362,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {
	createTask(taskId = 1),		createTask(taskId = 1),
	)		)

	assertThat(latest).isInstanceOf(OngoingActivityChipModel.Hidden::class.java)		assertThat(latest).isInstanceOf(OngoingActivityChipModel.Inactive::class.java)
	}		}

	@Test		@Test
	@@ -372,7 +373,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {
	mediaProjectionRepo.mediaProjectionState.value =		mediaProjectionRepo.mediaProjectionState.value =
	MediaProjectionState.Projecting.EntireScreen(NORMAL_PACKAGE)		MediaProjectionState.Projecting.EntireScreen(NORMAL_PACKAGE)

	assertThat(latest).isInstanceOf(OngoingActivityChipModel.Hidden::class.java)		assertThat(latest).isInstanceOf(OngoingActivityChipModel.Inactive::class.java)
	}		}

	@Test		@Test
	@@ -384,11 +385,12 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {
	mediaProjectionRepo.mediaProjectionState.value =		mediaProjectionRepo.mediaProjectionState.value =
	MediaProjectionState.Projecting.EntireScreen(CAST_TO_OTHER_DEVICES_PACKAGE)		MediaProjectionState.Projecting.EntireScreen(CAST_TO_OTHER_DEVICES_PACKAGE)

	assertThat(latest).isInstanceOf(OngoingActivityChipModel.Shown::class.java)		assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active::class.java)
	assertThat((latest as OngoingActivityChipModel.Shown.Timer).startTimeMs).isEqualTo(1234)		assertThat((latest as OngoingActivityChipModel.Active.Timer).startTimeMs)
			.isEqualTo(1234)

	mediaProjectionRepo.mediaProjectionState.value = MediaProjectionState.NotProjecting		mediaProjectionRepo.mediaProjectionState.value = MediaProjectionState.NotProjecting
	assertThat(latest).isInstanceOf(OngoingActivityChipModel.Hidden::class.java)		assertThat(latest).isInstanceOf(OngoingActivityChipModel.Inactive::class.java)

	systemClock.setElapsedRealtime(5678)		systemClock.setElapsedRealtime(5678)
	mediaProjectionRepo.mediaProjectionState.value =		mediaProjectionRepo.mediaProjectionState.value =
	@@ -398,8 +400,9 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {
	createTask(taskId = 1),		createTask(taskId = 1),
	)		)

	assertThat(latest).isInstanceOf(OngoingActivityChipModel.Shown::class.java)		assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active::class.java)
	assertThat((latest as OngoingActivityChipModel.Shown.Timer).startTimeMs).isEqualTo(5678)		assertThat((latest as OngoingActivityChipModel.Active.Timer).startTimeMs)
			.isEqualTo(5678)
	}		}

	@Test		@Test
	@@ -421,7 +424,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {
	)		)
	)		)

	assertThat(latest).isInstanceOf(OngoingActivityChipModel.Shown.IconOnly::class.java)		assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active.IconOnly::class.java)

	// Later, set MediaProjection to also have information		// Later, set MediaProjection to also have information
	systemClock.setElapsedRealtime(5678)		systemClock.setElapsedRealtime(5678)
	@@ -429,8 +432,9 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {
	MediaProjectionState.Projecting.EntireScreen(CAST_TO_OTHER_DEVICES_PACKAGE)		MediaProjectionState.Projecting.EntireScreen(CAST_TO_OTHER_DEVICES_PACKAGE)

	// Verify the new time is used		// Verify the new time is used
	assertThat(latest).isInstanceOf(OngoingActivityChipModel.Shown::class.java)		assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active::class.java)
	assertThat((latest as OngoingActivityChipModel.Shown.Timer).startTimeMs).isEqualTo(5678)		assertThat((latest as OngoingActivityChipModel.Active.Timer).startTimeMs)
			.isEqualTo(5678)
	}		}

	@Test		@Test
	@@ -441,7 +445,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {
	mediaProjectionRepo.mediaProjectionState.value =		mediaProjectionRepo.mediaProjectionState.value =
	MediaProjectionState.Projecting.EntireScreen(CAST_TO_OTHER_DEVICES_PACKAGE)		MediaProjectionState.Projecting.EntireScreen(CAST_TO_OTHER_DEVICES_PACKAGE)

	val clickListener = ((latest as OngoingActivityChipModel.Shown).onClickListenerLegacy)		val clickListener = ((latest as OngoingActivityChipModel.Active).onClickListenerLegacy)
	assertThat(clickListener).isNotNull()		assertThat(clickListener).isNotNull()

	clickListener!!.onClick(chipView)		clickListener!!.onClick(chipView)
	@@ -462,7 +466,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {
	createTask(taskId = 1),		createTask(taskId = 1),
	)		)

	val clickListener = ((latest as OngoingActivityChipModel.Shown).onClickListenerLegacy)		val clickListener = ((latest as OngoingActivityChipModel.Active).onClickListenerLegacy)
	assertThat(clickListener).isNotNull()		assertThat(clickListener).isNotNull()

	clickListener!!.onClick(chipView)		clickListener!!.onClick(chipView)
	@@ -487,7 +491,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {
	)		)
	)		)

	val clickListener = ((latest as OngoingActivityChipModel.Shown).onClickListenerLegacy)		val clickListener = ((latest as OngoingActivityChipModel.Active).onClickListenerLegacy)
	assertThat(clickListener).isNotNull()		assertThat(clickListener).isNotNull()

	clickListener!!.onClick(chipView)		clickListener!!.onClick(chipView)
	@@ -508,7 +512,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {
	mediaProjectionRepo.mediaProjectionState.value =		mediaProjectionRepo.mediaProjectionState.value =
	MediaProjectionState.Projecting.EntireScreen(CAST_TO_OTHER_DEVICES_PACKAGE)		MediaProjectionState.Projecting.EntireScreen(CAST_TO_OTHER_DEVICES_PACKAGE)

	val clickListener = ((latest as OngoingActivityChipModel.Shown).onClickListenerLegacy)		val clickListener = ((latest as OngoingActivityChipModel.Active).onClickListenerLegacy)
	clickListener!!.onClick(chipView)		clickListener!!.onClick(chipView)

	val cujCaptor = argumentCaptor<DialogCuj>()		val cujCaptor = argumentCaptor<DialogCuj>()
	@@ -537,7 +541,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {
	)		)
	)		)

	val clickListener = ((latest as OngoingActivityChipModel.Shown).onClickListenerLegacy)		val clickListener = ((latest as OngoingActivityChipModel.Active).onClickListenerLegacy)
	clickListener!!.onClick(chipView)		clickListener!!.onClick(chipView)

	val cujCaptor = argumentCaptor<DialogCuj>()		val cujCaptor = argumentCaptor<DialogCuj>()
	@@ -566,7 +570,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {
	)		)
	)		)

	assertThat((latest as OngoingActivityChipModel.Shown).clickBehavior)		assertThat((latest as OngoingActivityChipModel.Active).clickBehavior)
	.isInstanceOf(OngoingActivityChipModel.ClickBehavior.ExpandAction::class.java)		.isInstanceOf(OngoingActivityChipModel.ClickBehavior.ExpandAction::class.java)
	}		}

	@@ -579,7 +583,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {
	mediaProjectionRepo.mediaProjectionState.value =		mediaProjectionRepo.mediaProjectionState.value =
	MediaProjectionState.Projecting.EntireScreen(CAST_TO_OTHER_DEVICES_PACKAGE)		MediaProjectionState.Projecting.EntireScreen(CAST_TO_OTHER_DEVICES_PACKAGE)

	assertThat((latest as OngoingActivityChipModel.Shown).clickBehavior)		assertThat((latest as OngoingActivityChipModel.Active).clickBehavior)
	.isInstanceOf(OngoingActivityChipModel.ClickBehavior.ExpandAction::class.java)		.isInstanceOf(OngoingActivityChipModel.ClickBehavior.ExpandAction::class.java)
	}		}

	@@ -592,7 +596,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {
	MediaProjectionState.Projecting.EntireScreen(CAST_TO_OTHER_DEVICES_PACKAGE)		MediaProjectionState.Projecting.EntireScreen(CAST_TO_OTHER_DEVICES_PACKAGE)

	val expandAction =		val expandAction =
	((latest as OngoingActivityChipModel.Shown).clickBehavior		((latest as OngoingActivityChipModel.Active).clickBehavior
	as OngoingActivityChipModel.ClickBehavior.ExpandAction)		as OngoingActivityChipModel.ClickBehavior.ExpandAction)
	expandAction.onClick(mockExpandable)		expandAction.onClick(mockExpandable)

	@@ -614,7 +618,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {
	)		)

	val expandAction =		val expandAction =
	((latest as OngoingActivityChipModel.Shown).clickBehavior		((latest as OngoingActivityChipModel.Active).clickBehavior
	as OngoingActivityChipModel.ClickBehavior.ExpandAction)		as OngoingActivityChipModel.ClickBehavior.ExpandAction)
	expandAction.onClick(mockExpandable)		expandAction.onClick(mockExpandable)

	@@ -640,7 +644,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() {
	)		)

	val expandAction =		val expandAction =
	((latest as OngoingActivityChipModel.Shown).clickBehavior		((latest as OngoingActivityChipModel.Active).clickBehavior
	as OngoingActivityChipModel.ClickBehavior.ExpandAction)		as OngoingActivityChipModel.ClickBehavior.ExpandAction)
	expandAction.onClick(mockExpandable)		expandAction.onClick(mockExpandable)

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModelTest.kt

+20 −18

File changed.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/screenrecord/ui/viewmodel/ScreenRecordChipViewModelTest.kt

+40 −34

File changed.

Preview size limit exceeded, changes collapsed.

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/sharetoapp/ui/viewmodel/ShareToAppChipViewModelTest.kt

+36 −33

File changed.

Preview size limit exceeded, changes collapsed.