Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52f40e4b authored by Matt Pietal's avatar Matt Pietal
Browse files

Restore Quick affordance interactor test 

Were marked flaky long ago, but seem to pass reliably now.

Fixes: 292574995
Test: atest KeyguardQuickAffordanceInteractorParameterizedTest
Flag: EXEMPT bugfix
Change-Id: I73267722043dee735b0c3183c2a15d7189e16457
parent 5f18cce7

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) {