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

Commit 2f336593 authored by Matt Pietal's avatar Matt Pietal
Browse files

Disable related flexi occluded transition tests

These are now fully handled by STL, and no one relies on this

Fixes: 440355579
Test: atest SystemUITests
Flag: EXEMPT bugfix
Change-Id: Ib6268d6941a486d2547105918f86da35dc6fa8c1
parent a9a7d38b
Loading
Loading
Loading
Loading
+0 −39
Original line number Diff line number Diff line
@@ -236,45 +236,6 @@ class FromLockscreenTransitionInteractorTest : SysuiTestCase() {
            assertThatRepository(transitionRepository).noTransitionsStarted()
        }

    @EnableFlags(Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR)
    fun testTransitionsToOccluded_whenShowWhenLockedActivityOnTop() =
        testScope.runTest {
            underTest.start()
            runCurrent()

            reset(transitionRepository)
            kosmos.keyguardOcclusionRepository.setShowWhenLockedActivityInfo(
                true,
                ActivityManager.RunningTaskInfo().apply {
                    topActivityType = WindowConfiguration.ACTIVITY_TYPE_STANDARD
                },
            )
            runCurrent()

            assertThatRepository(transitionRepository)
                .startedTransition(from = KeyguardState.LOCKSCREEN, to = KeyguardState.OCCLUDED)
        }

    @Test
    @EnableFlags(Flags.FLAG_KEYGUARD_WM_STATE_REFACTOR)
    fun testTransitionsToDream_whenDreamActivityOnTop() =
        testScope.runTest {
            underTest.start()
            runCurrent()

            reset(transitionRepository)
            kosmos.keyguardOcclusionRepository.setShowWhenLockedActivityInfo(
                true,
                ActivityManager.RunningTaskInfo().apply {
                    topActivityType = WindowConfiguration.ACTIVITY_TYPE_DREAM
                },
            )
            runCurrent()

            assertThatRepository(transitionRepository)
                .startedTransition(from = KeyguardState.LOCKSCREEN, to = KeyguardState.DREAMING)
        }

    @Test
    @DisableSceneContainer
    fun testTransitionsBackToOccluded_ifOccluded_andCanceledSwipe() =
+1 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import org.junit.runner.RunWith

@SmallTest
@RunWith(AndroidJUnit4::class)
@DisableSceneContainer
class LockscreenToGoneTransitionViewModelTest : SysuiTestCase() {
    private val kosmos = testKosmos()
    private val testScope = kosmos.testScope
@@ -114,7 +115,6 @@ class LockscreenToGoneTransitionViewModelTest : SysuiTestCase() {
        }

    @Test
    @DisableSceneContainer
    fun notificationAlpha_leaveShadeOpen() =
        testScope.runTest {
            val values by collectValues(underTest.notificationAlpha(ViewStateAccessor()))
+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import androidx.test.filters.SmallTest
import com.android.systemui.SysuiTestCase
import com.android.systemui.biometrics.data.repository.fingerprintPropertyRepository
import com.android.systemui.coroutines.collectLastValue
import com.android.systemui.flags.DisableSceneContainer
import com.android.systemui.keyguard.data.repository.biometricSettingsRepository
import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepository
import com.android.systemui.keyguard.shared.model.KeyguardState
@@ -37,6 +38,7 @@ import org.junit.runner.RunWith

@SmallTest
@RunWith(AndroidJUnit4::class)
@DisableSceneContainer
class OccludedToAodTransitionViewModelTest : SysuiTestCase() {
    val kosmos = testKosmos()
    val testScope = kosmos.testScope
+1 −2
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ import org.junit.runner.RunWith

@SmallTest
@RunWith(AndroidJUnit4::class)
@DisableSceneContainer
class OccludedToLockscreenTransitionViewModelTest : SysuiTestCase() {
    val kosmos = testKosmos()
    val testScope = kosmos.testScope
@@ -99,7 +100,6 @@ class OccludedToLockscreenTransitionViewModelTest : SysuiTestCase() {
        }

    @Test
    @DisableSceneContainer
    fun statusBarAlphaOnCancel() =
        testScope.runTest {
            val values by collectValues(underTest.statusBarAlpha)
@@ -146,7 +146,6 @@ class OccludedToLockscreenTransitionViewModelTest : SysuiTestCase() {
        }

    @Test
    @DisableSceneContainer // onCancel values are not emitted when the scene container is enabled.
    fun lockscreenTranslationYResettedAfterJobCancelled() =
        testScope.runTest {
            configurationRepository.setDimensionPixelSize(
+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import com.android.systemui.SysuiTestCase
import com.android.systemui.authentication.data.repository.fakeAuthenticationRepository
import com.android.systemui.authentication.shared.model.AuthenticationMethodModel
import com.android.systemui.coroutines.collectLastValue
import com.android.systemui.flags.DisableSceneContainer
import com.android.systemui.flags.EnableSceneContainer
import com.android.systemui.keyguard.data.repository.fakeKeyguardTransitionRepository
import com.android.systemui.keyguard.shared.model.KeyguardState
@@ -54,6 +55,7 @@ class NotificationShadeWindowModelTest : SysuiTestCase() {
    }

    @Test
    @DisableSceneContainer
    fun transitionToOccludedByOCCLUDEDTransition() =
        testScope.runTest {
            val isKeyguardOccluded by collectLastValue(underTest.isKeyguardOccluded)
@@ -75,6 +77,7 @@ class NotificationShadeWindowModelTest : SysuiTestCase() {
        }

    @Test
    @DisableSceneContainer
    fun transitionToOccludedByDREAMINGTransition() =
        testScope.runTest {
            val isKeyguardOccluded by collectLastValue(underTest.isKeyguardOccluded)
@@ -96,6 +99,7 @@ class NotificationShadeWindowModelTest : SysuiTestCase() {
        }

    @Test
    @DisableSceneContainer
    fun transitionFromOccludedToDreamingTransitionRemainsTrue() =
        testScope.runTest {
            val isKeyguardOccluded by collectLastValue(underTest.isKeyguardOccluded)