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

Commit 1856c05c authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Disable flexi for tests that test GONE/PRIMARY_BOUNCER KTF states,... 

Merge "Disable flexi for tests that test GONE/PRIMARY_BOUNCER KTF states, which are deprecated in Flexi." into main
parents 5e739579 3a5ddf87

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

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import com.android.systemui.communal.domain.interactor.communalInteractor 
import com.android.systemui.communal.domain.interactor.communalSceneInteractor

import com.android.systemui.communal.domain.interactor.setCommunalV2ConfigEnabled

import com.android.systemui.communal.shared.model.CommunalScenes

import com.android.systemui.flags.DisableSceneContainer

import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository

import com.android.systemui.keyguard.data.repository.fakeKeyguardRepository

import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepositorySpy
@@ -129,6 +130,7 @@ class FromAlternateBouncerTransitionInteractorTest(flags: FlagsParameterization) 


    @Test

    @EnableFlags(Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR)

    @DisableSceneContainer // KeyguardDismissTransitionInteractor is not used in flexi.

    fun transitionToGone_keyguardOccludedThenAltBouncer_authed_wmStateRefactor() =

        testScope.runTest {

            transitionRepository.sendTransitionSteps(

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

+5 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import com.android.systemui.communal.domain.interactor.communalSceneInteractor 
import com.android.systemui.communal.domain.interactor.setCommunalV2Available

import com.android.systemui.communal.shared.model.CommunalScenes

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.flags.DisableSceneContainer

import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository

import com.android.systemui.keyguard.data.repository.fakeKeyguardRepository

import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepositorySpy
@@ -160,6 +161,7 @@ class FromAodTransitionInteractorTest : SysuiTestCase() { 


    @Test

    @EnableFlags(Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR)

    @DisableSceneContainer

    fun testTransitionToGone_onWakeUp_ifPowerButtonGestureDetected_fromAod_dismissibleKeyguard() =

        testScope.runTest {

            kosmos.fakeKeyguardRepository.setKeyguardDismissible(true)
@@ -174,6 +176,7 @@ class FromAodTransitionInteractorTest : SysuiTestCase() { 


    @Test

    @EnableFlags(Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR)

    @DisableSceneContainer

    fun testTransitionToGone_onWakeUp_ifPowerButtonGestureDetected_fromGone() =

        testScope.runTest {

            val isGone by
@@ -216,6 +219,7 @@ class FromAodTransitionInteractorTest : SysuiTestCase() { 


    @Test

    @EnableFlags(Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR)

    @DisableSceneContainer

    fun testTransitionToOccluded_onWakeUp_ifPowerButtonGestureDetectedAfterFinishedInAod_fromGone() =

        testScope.runTest {

            val isGone by
@@ -296,6 +300,7 @@ class FromAodTransitionInteractorTest : SysuiTestCase() { 


    @Test

    @EnableFlags(Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR)

    @DisableSceneContainer

    fun testWakeAndUnlock_transitionsToGone_onlyAfterDismissCallPostWakeup() =

        testScope.runTest {

            kosmos.fakeKeyguardRepository.setBiometricUnlockState(

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

+5 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import com.android.systemui.communal.data.repository.fakeCommunalSceneRepository 
import com.android.systemui.communal.domain.interactor.setCommunalAvailable

import com.android.systemui.communal.domain.interactor.setCommunalV2ConfigEnabled

import com.android.systemui.communal.shared.model.CommunalScenes

import com.android.systemui.flags.DisableSceneContainer

import com.android.systemui.keyguard.data.repository.fakeKeyguardRepository

import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepositorySpy

import com.android.systemui.keyguard.data.repository.keyguardOcclusionRepository
@@ -152,6 +153,7 @@ class FromDozingTransitionInteractorTest(flags: FlagsParameterization?) : SysuiT 


    @Test

    @EnableFlags(FLAG_KEYGUARD_WM_STATE_REFACTOR)

    @DisableSceneContainer // Specifically testing keyguard_wm_state_refactor enabled w/o flexi.

    fun testTransitionToLockscreen_onWake_canDream_ktfRefactor() =

        kosmos.runTest {

            setCommunalAvailable(true)
@@ -301,6 +303,7 @@ class FromDozingTransitionInteractorTest(flags: FlagsParameterization?) : SysuiT 


    @Test

    @EnableFlags(FLAG_KEYGUARD_WM_STATE_REFACTOR)

    @DisableSceneContainer

    fun testTransitionToGone_onWakeUp_ifPowerButtonGestureDetected_fromAod_dismissableKeyguard() =

        kosmos.runTest {

            fakeKeyguardRepository.setKeyguardDismissible(true)
@@ -314,6 +317,7 @@ class FromDozingTransitionInteractorTest(flags: FlagsParameterization?) : SysuiT 


    @Test

    @EnableFlags(FLAG_KEYGUARD_WM_STATE_REFACTOR)

    @DisableSceneContainer

    fun testTransitionToGone_onWakeUp_ifPowerButtonGestureDetected_fromGone() =

        kosmos.runTest {

            val isGone by
@@ -352,6 +356,7 @@ class FromDozingTransitionInteractorTest(flags: FlagsParameterization?) : SysuiT 
    @Test

    @EnableFlags(FLAG_KEYGUARD_WM_STATE_REFACTOR)

    @Suppress("ktlint:standard:max-line-length")

    @DisableSceneContainer

    fun testTransitionToOccluded_onWakeUp_ifPowerButtonGestureDetectedAfterFinishedInAod_fromGone() =

        kosmos.runTest {

            val isGone by

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

+3 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import androidx.test.filters.SmallTest 
import com.android.internal.widget.LockPatternUtils

import com.android.systemui.Flags

import com.android.systemui.SysuiTestCase

import com.android.systemui.flags.DisableSceneContainer

import com.android.systemui.keyguard.data.repository.fakeBiometricSettingsRepository

import com.android.systemui.keyguard.data.repository.fakeKeyguardRepository

import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepositorySpy
@@ -50,7 +51,7 @@ class FromGoneTransitionInteractorTest : SysuiTestCase() { 
            this.keyguardTransitionRepository = fakeKeyguardTransitionRepositorySpy

        }

    private val testScope = kosmos.testScope

    private val underTest = kosmos.fromGoneTransitionInteractor

    private val underTest by lazy { kosmos.fromGoneTransitionInteractor }

    private val keyguardTransitionRepository = kosmos.fakeKeyguardTransitionRepositorySpy



    @Before
@@ -105,6 +106,7 @@ class FromGoneTransitionInteractorTest : SysuiTestCase() { 


    @Test

    @EnableFlags(Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR)

    @DisableSceneContainer

    fun testTransitionsToLockscreen_ifFinishedInGone_wmRefactor() =

        testScope.runTest {

            keyguardTransitionRepository.sendTransitionSteps(

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

+3 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import androidx.test.filters.SmallTest 
import com.android.systemui.Flags

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectValues

import com.android.systemui.flags.DisableSceneContainer

import com.android.systemui.keyguard.data.repository.FakeKeyguardTransitionRepository

import com.android.systemui.keyguard.data.repository.fakeKeyguardRepository

import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepository
@@ -58,7 +59,7 @@ class FromLockscreenTransitionInteractorTest : SysuiTestCase() { 
        }



    private val testScope = kosmos.testScope

    private val underTest = kosmos.fromLockscreenTransitionInteractor

    private val underTest by lazy { kosmos.fromLockscreenTransitionInteractor }

    private lateinit var transitionRepository: FakeKeyguardTransitionRepository

    private val shadeRepository = kosmos.fakeShadeRepository

    private val keyguardRepository = kosmos.fakeKeyguardRepository
@@ -173,6 +174,7 @@ class FromLockscreenTransitionInteractorTest : SysuiTestCase() { 


    @Test

    @EnableFlags(Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR)

    @DisableSceneContainer

    fun testTransitionsToGone_whenDismissFlingWhileDismissable_flagEnabled() =

        testScope.runTest {

            underTest.start()