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

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

Merge "Fix ALTERNATE_BOUNCER->GONE..." into main

parents 26d9dcb8 2e336be2

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

+5 −3
Original line number Diff line number Diff line
@@ -46,11 +46,12 @@ import com.android.systemui.power.data.repository.fakePowerRepository 
import com.android.systemui.power.shared.model.WakeSleepReason

import com.android.systemui.power.shared.model.WakefulnessState

import com.android.systemui.testKosmos

import kotlin.test.Test

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.advanceTimeBy

import kotlinx.coroutines.test.runCurrent

import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.Mockito

import org.mockito.Mockito.reset
@@ -124,6 +125,8 @@ class FromAlternateBouncerTransitionInteractorTest : SysuiTestCase() { 
            )

            kosmos.fakeKeyguardRepository.setKeyguardOccluded(true)

            kosmos.fakeKeyguardBouncerRepository.setAlternateVisible(true)

            runCurrent()



            transitionRepository.sendTransitionSteps(

                from = KeyguardState.OCCLUDED,

                to = KeyguardState.ALTERNATE_BOUNCER,
@@ -132,8 +135,7 @@ class FromAlternateBouncerTransitionInteractorTest : SysuiTestCase() { 
            reset(transitionRepository)



            kosmos.fakeKeyguardBouncerRepository.setAlternateVisible(false)

            runCurrent()

            testScope.testScheduler.advanceTimeBy(200) // advance past delay

            advanceTimeBy(200) // advance past delay



            assertThat(transitionRepository)

                .startedTransition(

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

+2 −7
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import com.android.systemui.keyguard.data.repository.KeyguardTransitionRepositor 
import com.android.systemui.keyguard.shared.model.KeyguardState

import com.android.systemui.power.domain.interactor.PowerInteractor

import com.android.systemui.util.kotlin.Utils.Companion.sample as sampleCombine

import com.android.systemui.util.kotlin.sample as sampleUtil

import com.android.wm.shell.animation.Interpolators

import javax.inject.Inject

import kotlin.time.Duration.Companion.milliseconds
@@ -157,12 +156,8 @@ constructor( 
                        }

                    }

                )

                .sampleUtil(finishedKeyguardState)

                .collect { keyguardState ->

                    if (keyguardState == KeyguardState.ALTERNATE_BOUNCER) {

                        startTransitionTo(KeyguardState.GONE)

                    }

                }

                .filterRelevantKeyguardState()

                .collect { startTransitionTo(KeyguardState.GONE) }

        }

    }

packages/SystemUI/tests/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionScenariosTest.kt

+25 −0
Original line number Diff line number Diff line
@@ -896,6 +896,31 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { 
            coroutineContext.cancelChildren()

        }



    @Test

    fun alternateBouncerToGone() =

        testScope.runTest {

            // GIVEN a prior transition has run to ALTERNATE_BOUNCER

            bouncerRepository.setAlternateVisible(true)

            runTransitionAndSetWakefulness(

                KeyguardState.LOCKSCREEN,

                KeyguardState.ALTERNATE_BOUNCER

            )



            // GIVEN the keyguard is going away

            keyguardRepository.setKeyguardGoingAway(true)

            runCurrent()



            assertThat(transitionRepository)

                .startedTransition(

                    ownerName = "FromAlternateBouncerTransitionInteractor",

                    from = KeyguardState.ALTERNATE_BOUNCER,

                    to = KeyguardState.GONE,

                    animatorAssertion = { it.isNotNull() },

                )



            coroutineContext.cancelChildren()

        }



    @Test

    fun alternateBouncerToGlanceableHub() =

        testScope.runTest {

packages/SystemUI/tests/src/com/android/systemui/keyguard/util/KeyguardTransitionRepositorySpySubject.kt→packages/SystemUI/tests/utils/src/com/android/systemui/keyguard/util/KeyguardTransitionRepositorySpySubject.kt

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ import com.google.common.truth.Subject 
import com.google.common.truth.Truth

import com.google.common.truth.Truth.assertAbout

import junit.framework.Assert.assertEquals

import kotlin.test.fail

import org.junit.Assert.fail

import org.mockito.Mockito

import org.mockito.Mockito.never

import org.mockito.Mockito.verify