Merge "Restore Quick affordance interactor test" into main (f5153cb2) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/domain/interactor/KeyguardQuickAffordanceInteractorParameterizedTest.kt

+4 −23

Original line number	Original line	Diff line number	Diff line
	@@ -20,7 +20,6 @@ package com.android.systemui.keyguard.domain.interactor
	import android.app.admin.DevicePolicyManager		import android.app.admin.DevicePolicyManager
	import android.content.Intent		import android.content.Intent
	import android.os.UserHandle		import android.os.UserHandle
	import androidx.test.filters.FlakyTest
	import androidx.test.filters.SmallTest		import androidx.test.filters.SmallTest
	import com.android.internal.widget.LockPatternUtils		import com.android.internal.widget.LockPatternUtils
	import com.android.keyguard.logging.KeyguardQuickAffordancesLogger		import com.android.keyguard.logging.KeyguardQuickAffordancesLogger
	@@ -79,10 +78,6 @@ import platform.test.runner.parameterized.ParameterizedAndroidJunit4
	import platform.test.runner.parameterized.Parameters		import platform.test.runner.parameterized.Parameters

	@OptIn(ExperimentalCoroutinesApi::class)		@OptIn(ExperimentalCoroutinesApi::class)
	@FlakyTest(
	bugId = 292574995,
	detail = "on certain architectures all permutations with startActivity=true is causing failures"
	)
	@SmallTest		@SmallTest
	@RunWith(ParameterizedAndroidJunit4::class)		@RunWith(ParameterizedAndroidJunit4::class)
	@DisableSceneContainer		@DisableSceneContainer
	@@ -93,11 +88,7 @@ class KeyguardQuickAffordanceInteractorParameterizedTest : SysuiTestCase() {
	private val DRAWABLE =		private val DRAWABLE =
	mock<Icon> {		mock<Icon> {
	whenever(this.contentDescription)		whenever(this.contentDescription)
	.thenReturn(		.thenReturn(ContentDescription.Resource(res = CONTENT_DESCRIPTION_RESOURCE_ID))
	ContentDescription.Resource(
	res = CONTENT_DESCRIPTION_RESOURCE_ID,
	)
	)
	}		}
	private const val CONTENT_DESCRIPTION_RESOURCE_ID = 1337		private const val CONTENT_DESCRIPTION_RESOURCE_ID = 1337

	@@ -273,13 +264,7 @@ class KeyguardQuickAffordanceInteractorParameterizedTest : SysuiTestCase() {
	context = context,		context = context,
	userFileManager =		userFileManager =
	mock<UserFileManager>().apply {		mock<UserFileManager>().apply {
	whenever(		whenever(getSharedPreferences(anyString(), anyInt(), anyInt()))
	getSharedPreferences(
	anyString(),
	anyInt(),
	anyInt(),
	)
	)
	.thenReturn(FakeSharedPreferences())		.thenReturn(FakeSharedPreferences())
	},		},
	userTracker = userTracker,		userTracker = userTracker,
	@@ -316,9 +301,7 @@ class KeyguardQuickAffordanceInteractorParameterizedTest : SysuiTestCase() {
	underTest =		underTest =
	KeyguardQuickAffordanceInteractor(		KeyguardQuickAffordanceInteractor(
	keyguardInteractor =		keyguardInteractor =
	KeyguardInteractorFactory.create(		KeyguardInteractorFactory.create(featureFlags = featureFlags)
	featureFlags = featureFlags,
	)
	.keyguardInteractor,		.keyguardInteractor,
	shadeInteractor = kosmos.shadeInteractor,		shadeInteractor = kosmos.shadeInteractor,
	lockPatternUtils = lockPatternUtils,		lockPatternUtils = lockPatternUtils,
	@@ -350,9 +333,7 @@ class KeyguardQuickAffordanceInteractorParameterizedTest : SysuiTestCase() {

	homeControls.setState(		homeControls.setState(
	lockScreenState =		lockScreenState =
	KeyguardQuickAffordanceConfig.LockScreenState.Visible(		KeyguardQuickAffordanceConfig.LockScreenState.Visible(icon = DRAWABLE)
	icon = DRAWABLE,
	)
	)		)
	homeControls.onTriggeredResult =		homeControls.onTriggeredResult =
	if (startActivity) {		if (startActivity) {