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

Commit 03a8f17c authored by Beverly's avatar Beverly
Browse files

[flexi] Disable unneeded TransitionInteractorTests 

When SceneContainer is enabled:
* FromLockscrenTransitionInteractor no longer handles
transitions to the bouncer (including swipes).
* TransitionInteractors aren't the source of truth
for surfaceBehindVisibility. See
WindowManagerLockscreenVisibilityInteractor.
* KeyguardState.PRIMARY_BOUNCER is deprecated,
disable running FromPrimaryBouncerTransitionInteractorTest

Test: atest FromLockscreenTransitionInteractorTest
Test: atest FromPrimaryBouncerTransitionInteractorTest
Fixes: 416716619
Fixes: 416717137
Flag: TEST_ONLY
Change-Id: Ifb5b44a7065b18949b99df8f47e093849634e8a2
parent 6129796b

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

+6 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ class FromLockscreenTransitionInteractorTest : SysuiTestCase() { 
    }



    @Test

    @DisableSceneContainer

    fun testSurfaceBehindVisibility() =

        testScope.runTest {

            val values by collectValues(underTest.surfaceBehindVisibility)
@@ -126,6 +127,7 @@ class FromLockscreenTransitionInteractorTest : SysuiTestCase() { 
        }



    @Test

    @DisableSceneContainer

    fun draggingToPrimaryBouncerUpdateIsSent() =

        testScope.runTest {

            underTest.start()
@@ -199,6 +201,7 @@ class FromLockscreenTransitionInteractorTest : SysuiTestCase() { 


    @Test

    @DisableFlags(Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR)

    @DisableSceneContainer

    fun testDoesNotTransitionToGone_whenDismissFlingWhileDismissable_flagDisabled() =

        testScope.runTest {

            underTest.start()
@@ -216,6 +219,7 @@ class FromLockscreenTransitionInteractorTest : SysuiTestCase() { 


    @Test

    @DisableFlags(Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR)

    @DisableSceneContainer

    fun testDoesNotTransitionToGone_whenDismissFling_emitsNull() =

        testScope.runTest {

            underTest.start()
@@ -272,6 +276,7 @@ class FromLockscreenTransitionInteractorTest : SysuiTestCase() { 
        }



    @Test

    @DisableSceneContainer

    fun testTransitionsBackToOccluded_ifOccluded_andCanceledSwipe() =

        testScope.runTest {

            underTest.start()
@@ -316,6 +321,7 @@ class FromLockscreenTransitionInteractorTest : SysuiTestCase() { 
     * ID to get stuck in this scenario, preventing subsequent transitions to PRIMARY_BOUNCER.

     */

    @Test

    @DisableSceneContainer

    fun testExternalTransitionAwayFromBouncer_transitionIdNotStuck() =

        testScope.runTest {

            underTest.start()

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

+1 −5
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ import platform.test.runner.parameterized.Parameters 
@OptIn(ExperimentalCoroutinesApi::class)

@SmallTest

@RunWith(ParameterizedAndroidJunit4::class)

@DisableSceneContainer // PRIMARY_BOUNCER is not used in flexi.

class FromPrimaryBouncerTransitionInteractorTest(flags: FlagsParameterization) : SysuiTestCase() {



    companion object {
@@ -171,7 +172,6 @@ class FromPrimaryBouncerTransitionInteractorTest(flags: FlagsParameterization) : 


    @Test

    @EnableFlags(FLAG_KEYGUARD_WM_STATE_REFACTOR)

    @DisableSceneContainer // PRIMARY_BOUNCER is not used in flexi.

    fun testReturnToLockscreen_whenBouncerHides() =

        testScope.runTest {

            underTest.start()
@@ -196,7 +196,6 @@ class FromPrimaryBouncerTransitionInteractorTest(flags: FlagsParameterization) : 


    @Test

    @EnableFlags(FLAG_KEYGUARD_WM_STATE_REFACTOR)

    @DisableSceneContainer

    fun testReturnToGlanceableHub_whenBouncerHides_ifIdleOnCommunal() =

        testScope.runTest {

            underTest.start()
@@ -225,7 +224,6 @@ class FromPrimaryBouncerTransitionInteractorTest(flags: FlagsParameterization) : 
    @Test

    @EnableFlags(FLAG_HUB_EDIT_MODE_TRANSITION)

    @DisableFlags(FLAG_KEYGUARD_WM_STATE_REFACTOR)

    @DisableSceneContainer

    fun testPrimaryBouncerToGone_whenEnteringHubEditMode_flagOn_doNothing() =

        kosmos.runTest {

            underTest.start()
@@ -246,7 +244,6 @@ class FromPrimaryBouncerTransitionInteractorTest(flags: FlagsParameterization) : 


    @Test

    @DisableFlags(FLAG_HUB_EDIT_MODE_TRANSITION, FLAG_KEYGUARD_WM_STATE_REFACTOR)

    @DisableSceneContainer

    fun testPrimaryBouncerToGone_whenEnteringHubEditMode_flagOff_transitionToGone() =

        kosmos.runTest {

            underTest.start()
@@ -265,7 +262,6 @@ class FromPrimaryBouncerTransitionInteractorTest(flags: FlagsParameterization) : 


    @Test

    @EnableFlags(FLAG_KEYGUARD_WM_STATE_REFACTOR)

    @DisableSceneContainer

    fun testTransitionToOccluded_bouncerHide_occludingActivityOnTop() =

        testScope.runTest {

            underTest.start()