Merge "Replace Sealed Class mock for Robolectric test" into udc-dev (e68bdefb) · Commits · e / os / android_frameworks_base

packages/SystemUI/Android.bp

+0 −4

Original line number	Diff line number	Diff line
		@@ -243,15 +243,11 @@ filegroup {
		// domain
		"tests/src/com/android/systemui/keyguard/domain/interactor/AlternateBouncerInteractorTest.kt",
		"tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorTest.kt",
		"tests/src/com/android/systemui/keyguard/domain/interactor/AlternateBouncerInteractorTest.kt",
		"tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorTest.kt",
		"tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorTest.kt",
		"tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractorTest.kt",
		"tests/src/com/android/systemui/keyguard/domain/interactor/LightRevealScrimInteractorTest.kt",
		"tests/src/com/android/systemui/keyguard/domain/quickaffordance/FakeKeyguardQuickAffordanceRegistry.kt",
		"tests/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractorWithCoroutinesTest.kt",
		"tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardInteractorTest.kt",
		"tests/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractorWithCoroutinesTest.kt",
		// ui
		"tests/src/com/android/systemui/keyguard/ui/viewmodel/DreamingToLockscreenTransitionViewModelTest.kt",
		"tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardBouncerViewModelTest.kt",

+7 −7

Original line number	Diff line number	Diff line
		@@ -635,14 +635,14 @@ class KeyguardQuickAffordanceInteractorTest : SysuiTestCase() {
		}

		companion object {
		private val ICON: Icon = mock {
		whenever(this.contentDescription)
		.thenReturn(
		private const val CONTENT_DESCRIPTION_RESOURCE_ID = 1337
		private val ICON: Icon =
		Icon.Resource(
		res = CONTENT_DESCRIPTION_RESOURCE_ID,
		contentDescription =
		ContentDescription.Resource(
		res = CONTENT_DESCRIPTION_RESOURCE_ID,
		),
		)
		)
		}
		private const val CONTENT_DESCRIPTION_RESOURCE_ID = 1337
		}
		}