Merge "[SB][Chips] Fix NotifChipsViewModelTest asserting same model instance" into main (e81f2c4f) · Commits · e / os / android_frameworks_base

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

+6 −4

Original line number	Diff line number	Diff line
		@@ -468,11 +468,12 @@ class NotifChipsViewModelTest : SysuiTestCase() {
		PromotedNotificationContentBuilder("notif").applyToShared {
		this.time = When.Time(currentTime)
		}
		val icon = createStatusBarIconViewOrNull()
		setNotifs(
		listOf(
		activeNotificationModel(
		key = "notif",
		statusBarChipIcon = createStatusBarIconViewOrNull(),
		statusBarChipIcon = icon,
		promotedContent = oldPromotedContentBuilder.build(),
		)
		)
		@@ -493,7 +494,7 @@ class NotifChipsViewModelTest : SysuiTestCase() {
		listOf(
		activeNotificationModel(
		key = "notif",
		statusBarChipIcon = createStatusBarIconViewOrNull(),
		statusBarChipIcon = icon,
		promotedContent = newPromotedContentBuilder.build(),
		)
		)
		@@ -513,11 +514,12 @@ class NotifChipsViewModelTest : SysuiTestCase() {
		PromotedNotificationContentBuilder("notif").applyToShared {
		this.subText = "Old subtext"
		}
		val icon = createStatusBarIconViewOrNull()
		setNotifs(
		listOf(
		activeNotificationModel(
		key = "notif",
		statusBarChipIcon = createStatusBarIconViewOrNull(),
		statusBarChipIcon = icon,
		promotedContent = oldPromotedContentBuilder.build(),
		)
		)
		@@ -536,7 +538,7 @@ class NotifChipsViewModelTest : SysuiTestCase() {
		listOf(
		activeNotificationModel(
		key = "notif",
		statusBarChipIcon = createStatusBarIconViewOrNull(),
		statusBarChipIcon = icon,
		promotedContent = newPromotedContentBuilder.build(),
		)
		)