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

Commit 20da9460 authored by Steve Elliott's avatar Steve Elliott
Browse files

[flexiglass] Factor out ShadeSceneFamilyResolver 

Flag: com.android.systemui.scene_container DEVELOPMENT
Bug: 344624611
Test: atest SceneInteractorTest
Change-Id: I0d88c7d8617baa5c601803e8d712a83c7bbaa098
parent e0abf061

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/ui/viewmodel/LockscreenSceneViewModelTest.kt

+24 −4
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import com.android.systemui.util.mockito.mock 
import com.google.common.truth.Truth.assertThat

import kotlin.math.pow

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.flowOf

import kotlinx.coroutines.test.runTest

import org.junit.BeforeClass

import org.junit.Test
@@ -205,8 +206,13 @@ class LockscreenSceneViewModelTest : SysuiTestCase() { 
                        pointerCount = if (downWithTwoPointers) 2 else 1,

                    )

                )



            assertThat(downDestination?.toScene)

            val downScene by

                collectLastValue(

                    downDestination?.let {

                        kosmos.sceneInteractor.resolveSceneFamily(downDestination.toScene)

                    } ?: flowOf(null)

                )

            assertThat(downScene)

                .isEqualTo(

                    expectedDownDestination(

                        downFromEdge = downFromEdge,
@@ -223,7 +229,14 @@ class LockscreenSceneViewModelTest : SysuiTestCase() { 
                    )

                )



            assertThat(destinationScenes?.get(Swipe(SwipeDirection.Up))?.toScene)

            val upScene by

                collectLastValue(

                    destinationScenes?.get(Swipe(SwipeDirection.Up))?.toScene?.let { scene ->

                        kosmos.sceneInteractor.resolveSceneFamily(scene)

                    } ?: flowOf(null)

                )



            assertThat(upScene)

                .isEqualTo(

                    expectedUpDestination(

                        canSwipeToEnter = canSwipeToEnter,
@@ -231,7 +244,14 @@ class LockscreenSceneViewModelTest : SysuiTestCase() { 
                    )

                )



            assertThat(destinationScenes?.get(Swipe(SwipeDirection.Left))?.toScene)

            val leftScene by

                collectLastValue(

                    destinationScenes?.get(Swipe(SwipeDirection.Left))?.toScene?.let { scene ->

                        kosmos.sceneInteractor.resolveSceneFamily(scene)

                    } ?: flowOf(null)

                )



            assertThat(leftScene)

                .isEqualTo(

                    expectedLeftDestination(

                        isCommunalAvailable = isCommunalAvailable,

packages/SystemUI/multivalentTests/src/com/android/systemui/notifications/ui/viewmodel/NotificationsShadeSceneViewModelTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ import com.android.systemui.flags.EnableSceneContainer 
import com.android.systemui.keyguard.data.repository.fakeDeviceEntryFingerprintAuthRepository

import com.android.systemui.keyguard.shared.model.SuccessFingerprintAuthenticationStatus

import com.android.systemui.kosmos.testScope

import com.android.systemui.scene.domain.interactor.homeSceneFamilyResolver

import com.android.systemui.scene.domain.interactor.sceneInteractor

import com.android.systemui.scene.domain.resolver.homeSceneFamilyResolver

import com.android.systemui.scene.shared.model.SceneFamilies

import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.shade.ui.viewmodel.notificationsShadeSceneViewModel

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsSceneViewModelTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -41,10 +41,10 @@ import com.android.systemui.qs.FooterActionsController 
import com.android.systemui.qs.footer.ui.viewmodel.FooterActionsViewModel

import com.android.systemui.qs.ui.adapter.FakeQSSceneAdapter

import com.android.systemui.res.R

import com.android.systemui.scene.domain.interactor.homeSceneFamilyResolver

import com.android.systemui.scene.domain.interactor.sceneBackInteractor

import com.android.systemui.scene.domain.interactor.sceneContainerStartable

import com.android.systemui.scene.domain.interactor.sceneInteractor

import com.android.systemui.scene.domain.resolver.homeSceneFamilyResolver

import com.android.systemui.scene.shared.model.SceneFamilies

import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.settings.brightness.ui.viewmodel.brightnessMirrorViewModel

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/ui/viewmodel/QuickSettingsShadeSceneViewModelTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ import com.android.systemui.flags.EnableSceneContainer 
import com.android.systemui.keyguard.data.repository.fakeDeviceEntryFingerprintAuthRepository

import com.android.systemui.keyguard.shared.model.SuccessFingerprintAuthenticationStatus

import com.android.systemui.kosmos.testScope

import com.android.systemui.scene.domain.interactor.homeSceneFamilyResolver

import com.android.systemui.scene.domain.interactor.sceneInteractor

import com.android.systemui.scene.domain.resolver.homeSceneFamilyResolver

import com.android.systemui.scene.shared.model.SceneFamilies

import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.shade.ui.viewmodel.quickSettingsShadeSceneViewModel

packages/SystemUI/multivalentTests/src/com/android/systemui/scene/SceneFrameworkIntegrationTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -58,9 +58,9 @@ import com.android.systemui.power.domain.interactor.powerInteractor 
import com.android.systemui.qs.footerActionsController

import com.android.systemui.qs.footerActionsViewModelFactory

import com.android.systemui.qs.ui.adapter.FakeQSSceneAdapter

import com.android.systemui.scene.domain.interactor.homeSceneFamilyResolver

import com.android.systemui.scene.domain.interactor.sceneContainerStartable

import com.android.systemui.scene.domain.interactor.sceneInteractor

import com.android.systemui.scene.domain.resolver.homeSceneFamilyResolver

import com.android.systemui.scene.shared.model.SceneFamilies

import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.scene.shared.model.fakeSceneDataSource