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

Commit ac77d3ff authored by Lucas Silva's avatar Lucas Silva
Browse files

Delete communal test factories in favor of kosmos 

This change migrates all existing usages of the factories to kosmos, and
deletes the factories.

Fixes: 319335645
Test: NA
Flag: NA
Change-Id: I08fdcb2420e737e6f8224a52280514bcccd69b97
parent 3b5d8b97

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/view/viewmodel/CommunalEditModeViewModelTest.kt

+10 −13
Original line number Diff line number Diff line
@@ -24,19 +24,21 @@ import androidx.test.filters.SmallTest 
import com.android.internal.logging.UiEventLogger

import com.android.systemui.SysuiTestCase

import com.android.systemui.communal.data.repository.FakeCommunalMediaRepository

import com.android.systemui.communal.data.repository.FakeCommunalRepository

import com.android.systemui.communal.data.repository.FakeCommunalTutorialRepository

import com.android.systemui.communal.data.repository.FakeCommunalWidgetRepository

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

import com.android.systemui.communal.data.repository.fakeCommunalMediaRepository

import com.android.systemui.communal.data.repository.fakeCommunalTutorialRepository

import com.android.systemui.communal.data.repository.fakeCommunalWidgetRepository

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

import com.android.systemui.communal.domain.model.CommunalContentModel

import com.android.systemui.communal.shared.log.CommunalUiEvent

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

import com.android.systemui.communal.ui.viewmodel.CommunalEditModeViewModel

import com.android.systemui.coroutines.collectLastValue

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

import com.android.systemui.kosmos.testScope

import com.android.systemui.media.controls.ui.MediaHost

import com.android.systemui.smartspace.data.repository.FakeSmartspaceRepository

import com.android.systemui.smartspace.data.repository.fakeSmartspaceRepository

import com.android.systemui.testKosmos

import com.android.systemui.util.mockito.mock

import com.android.systemui.util.mockito.whenever
@@ -59,8 +61,6 @@ class CommunalEditModeViewModelTest : SysuiTestCase() { 
    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope



    private lateinit var keyguardRepository: FakeKeyguardRepository

    private lateinit var communalRepository: FakeCommunalRepository

    private lateinit var tutorialRepository: FakeCommunalTutorialRepository

    private lateinit var widgetRepository: FakeCommunalWidgetRepository

    private lateinit var smartspaceRepository: FakeSmartspaceRepository
@@ -72,17 +72,14 @@ class CommunalEditModeViewModelTest : SysuiTestCase() { 
    fun setUp() {

        MockitoAnnotations.initMocks(this)



        val withDeps = CommunalInteractorFactory.create(testScope)

        keyguardRepository = withDeps.keyguardRepository

        communalRepository = withDeps.communalRepository

        tutorialRepository = withDeps.tutorialRepository

        widgetRepository = withDeps.widgetRepository

        smartspaceRepository = withDeps.smartspaceRepository

        mediaRepository = withDeps.mediaRepository

        tutorialRepository = kosmos.fakeCommunalTutorialRepository

        widgetRepository = kosmos.fakeCommunalWidgetRepository

        smartspaceRepository = kosmos.fakeSmartspaceRepository

        mediaRepository = kosmos.fakeCommunalMediaRepository



        underTest =

            CommunalEditModeViewModel(

                withDeps.communalInteractor,

                kosmos.communalInteractor,

                mediaHost,

                uiEventLogger,

            )

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/view/viewmodel/CommunalViewModelTest.kt

+18 −19
Original line number Diff line number Diff line
@@ -23,25 +23,30 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 
import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.communal.data.repository.FakeCommunalMediaRepository

import com.android.systemui.communal.data.repository.FakeCommunalPrefsRepository

import com.android.systemui.communal.data.repository.FakeCommunalRepository

import com.android.systemui.communal.data.repository.FakeCommunalTutorialRepository

import com.android.systemui.communal.data.repository.FakeCommunalWidgetRepository

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

import com.android.systemui.communal.data.repository.fakeCommunalMediaRepository

import com.android.systemui.communal.data.repository.fakeCommunalTutorialRepository

import com.android.systemui.communal.data.repository.fakeCommunalWidgetRepository

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

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

import com.android.systemui.communal.domain.model.CommunalContentModel

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

import com.android.systemui.communal.ui.viewmodel.CommunalViewModel

import com.android.systemui.communal.ui.viewmodel.CommunalViewModel.Companion.POPUP_AUTO_HIDE_TIMEOUT_MS

import com.android.systemui.coroutines.collectLastValue

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

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

import com.android.systemui.kosmos.testScope

import com.android.systemui.media.controls.ui.MediaHierarchyManager

import com.android.systemui.media.controls.ui.MediaHost

import com.android.systemui.smartspace.data.repository.FakeSmartspaceRepository

import com.android.systemui.smartspace.data.repository.fakeSmartspaceRepository

import com.android.systemui.testKosmos

import com.android.systemui.util.mockito.mock

import com.android.systemui.util.mockito.whenever

import com.google.common.truth.Truth.assertThat

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.TestScope

import kotlinx.coroutines.test.advanceTimeBy

import kotlinx.coroutines.test.runTest

import org.junit.Before
@@ -58,15 +63,14 @@ import org.mockito.MockitoAnnotations 
class CommunalViewModelTest : SysuiTestCase() {

    @Mock private lateinit var mediaHost: MediaHost



    private lateinit var testScope: TestScope

    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope



    private lateinit var keyguardRepository: FakeKeyguardRepository

    private lateinit var communalRepository: FakeCommunalRepository

    private lateinit var tutorialRepository: FakeCommunalTutorialRepository

    private lateinit var widgetRepository: FakeCommunalWidgetRepository

    private lateinit var smartspaceRepository: FakeSmartspaceRepository

    private lateinit var mediaRepository: FakeCommunalMediaRepository

    private lateinit var communalPrefsRepository: FakeCommunalPrefsRepository



    private lateinit var underTest: CommunalViewModel
@@ -74,22 +78,17 @@ class CommunalViewModelTest : SysuiTestCase() { 
    fun setUp() {

        MockitoAnnotations.initMocks(this)



        testScope = TestScope()



        val withDeps = CommunalInteractorFactory.create()

        keyguardRepository = withDeps.keyguardRepository

        communalRepository = withDeps.communalRepository

        tutorialRepository = withDeps.tutorialRepository

        widgetRepository = withDeps.widgetRepository

        smartspaceRepository = withDeps.smartspaceRepository

        mediaRepository = withDeps.mediaRepository

        communalPrefsRepository = withDeps.communalPrefsRepository

        keyguardRepository = kosmos.fakeKeyguardRepository

        tutorialRepository = kosmos.fakeCommunalTutorialRepository

        widgetRepository = kosmos.fakeCommunalWidgetRepository

        smartspaceRepository = kosmos.fakeSmartspaceRepository

        mediaRepository = kosmos.fakeCommunalMediaRepository



        underTest =

            CommunalViewModel(

                testScope,

                withDeps.communalInteractor,

                withDeps.tutorialInteractor,

                kosmos.communalInteractor,

                kosmos.communalTutorialInteractor,

                mediaHost,

            )

    }

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

+35 −31
Original line number Diff line number Diff line
@@ -23,8 +23,9 @@ import com.android.keyguard.KeyguardSecurityModel.SecurityMode.PIN 
import com.android.systemui.Flags.FLAG_COMMUNAL_HUB

import com.android.systemui.SysuiTestCase

import com.android.systemui.bouncer.data.repository.FakeKeyguardBouncerRepository

import com.android.systemui.bouncer.data.repository.fakeKeyguardBouncerRepository

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

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

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

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

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

import com.android.systemui.flags.FakeFeatureFlags
@@ -34,6 +35,8 @@ import com.android.systemui.keyguard.data.repository.FakeKeyguardRepository 
import com.android.systemui.keyguard.data.repository.FakeKeyguardSurfaceBehindRepository

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

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

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

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

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

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

import com.android.systemui.keyguard.shared.model.DozeTransitionModel
@@ -42,11 +45,15 @@ import com.android.systemui.keyguard.shared.model.StatusBarState 
import com.android.systemui.keyguard.shared.model.TransitionInfo

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

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

import com.android.systemui.kosmos.testDispatcher

import com.android.systemui.kosmos.testScope

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

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

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

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

import com.android.systemui.shade.data.repository.FakeShadeRepository

import com.android.systemui.shade.data.repository.fakeShadeRepository

import com.android.systemui.testKosmos

import com.android.systemui.user.domain.interactor.SelectedUserInteractor

import com.android.systemui.util.mockito.any

import com.android.systemui.util.mockito.mock
@@ -57,7 +64,6 @@ import kotlinx.coroutines.ExperimentalCoroutinesApi 
import kotlinx.coroutines.cancelChildren

import kotlinx.coroutines.flow.MutableStateFlow

import kotlinx.coroutines.flow.flowOf

import kotlinx.coroutines.test.StandardTestDispatcher

import kotlinx.coroutines.test.TestScope

import kotlinx.coroutines.test.advanceUntilIdle

import kotlinx.coroutines.test.runCurrent
@@ -83,7 +89,8 @@ import org.mockito.MockitoAnnotations 
@SmallTest

@RunWith(JUnit4::class)

class KeyguardTransitionScenariosTest : SysuiTestCase() {

    private lateinit var testScope: TestScope

    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope



    private lateinit var keyguardRepository: FakeKeyguardRepository

    private lateinit var bouncerRepository: FakeKeyguardBouncerRepository
@@ -119,17 +126,14 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { 
    @Before

    fun setUp() {

        MockitoAnnotations.initMocks(this)

        val testDispatcher = StandardTestDispatcher()

        testScope = TestScope(testDispatcher)



        keyguardRepository = FakeKeyguardRepository()

        bouncerRepository = FakeKeyguardBouncerRepository()

        keyguardRepository = kosmos.fakeKeyguardRepository

        bouncerRepository = kosmos.fakeKeyguardBouncerRepository

        commandQueue = FakeCommandQueue()

        shadeRepository = FakeShadeRepository()

        transitionRepository = spy(FakeKeyguardTransitionRepository())

        shadeRepository = kosmos.fakeShadeRepository

        transitionRepository = spy(kosmos.fakeKeyguardTransitionRepository)

        powerInteractor = PowerInteractorFactory.create().powerInteractor

        communalInteractor =

            CommunalInteractorFactory.create(testScope = testScope).communalInteractor

        communalInteractor = kosmos.communalInteractor



        whenever(keyguardSecurityModel.getSecurityMode(anyInt())).thenReturn(PIN)
@@ -160,8 +164,8 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { 
        fromLockscreenTransitionInteractor =

            FromLockscreenTransitionInteractor(

                    scope = testScope,

                    bgDispatcher = testDispatcher,

                    mainDispatcher = testDispatcher,

                    bgDispatcher = kosmos.testDispatcher,

                    mainDispatcher = kosmos.testDispatcher,

                    keyguardInteractor = keyguardInteractor,

                    transitionRepository = transitionRepository,

                    transitionInteractor = transitionInteractor,
@@ -184,8 +188,8 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { 
        fromPrimaryBouncerTransitionInteractor =

            FromPrimaryBouncerTransitionInteractor(

                    scope = testScope,

                    bgDispatcher = testDispatcher,

                    mainDispatcher = testDispatcher,

                    bgDispatcher = kosmos.testDispatcher,

                    mainDispatcher = kosmos.testDispatcher,

                    keyguardInteractor = keyguardInteractor,

                    transitionRepository = transitionRepository,

                    transitionInteractor = transitionInteractor,
@@ -199,8 +203,8 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { 
        fromDreamingTransitionInteractor =

            FromDreamingTransitionInteractor(

                    scope = testScope,

                    bgDispatcher = testDispatcher,

                    mainDispatcher = testDispatcher,

                    bgDispatcher = kosmos.testDispatcher,

                    mainDispatcher = kosmos.testDispatcher,

                    keyguardInteractor = keyguardInteractor,

                    transitionRepository = transitionRepository,

                    transitionInteractor = transitionInteractor,
@@ -210,8 +214,8 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { 
        fromDreamingLockscreenHostedTransitionInteractor =

            FromDreamingLockscreenHostedTransitionInteractor(

                    scope = testScope,

                    bgDispatcher = testDispatcher,

                    mainDispatcher = testDispatcher,

                    bgDispatcher = kosmos.testDispatcher,

                    mainDispatcher = kosmos.testDispatcher,

                    keyguardInteractor = keyguardInteractor,

                    transitionRepository = transitionRepository,

                    transitionInteractor = transitionInteractor,
@@ -221,8 +225,8 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { 
        fromAodTransitionInteractor =

            FromAodTransitionInteractor(

                    scope = testScope,

                    bgDispatcher = testDispatcher,

                    mainDispatcher = testDispatcher,

                    bgDispatcher = kosmos.testDispatcher,

                    mainDispatcher = kosmos.testDispatcher,

                    keyguardInteractor = keyguardInteractor,

                    transitionRepository = transitionRepository,

                    transitionInteractor = transitionInteractor,
@@ -232,8 +236,8 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { 
        fromGoneTransitionInteractor =

            FromGoneTransitionInteractor(

                    scope = testScope,

                    bgDispatcher = testDispatcher,

                    mainDispatcher = testDispatcher,

                    bgDispatcher = kosmos.testDispatcher,

                    mainDispatcher = kosmos.testDispatcher,

                    keyguardInteractor = keyguardInteractor,

                    transitionRepository = transitionRepository,

                    transitionInteractor = transitionInteractor,
@@ -244,8 +248,8 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { 
        fromDozingTransitionInteractor =

            FromDozingTransitionInteractor(

                    scope = testScope,

                    bgDispatcher = testDispatcher,

                    mainDispatcher = testDispatcher,

                    bgDispatcher = kosmos.testDispatcher,

                    mainDispatcher = kosmos.testDispatcher,

                    keyguardInteractor = keyguardInteractor,

                    transitionRepository = transitionRepository,

                    transitionInteractor = transitionInteractor,
@@ -257,8 +261,8 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { 
        fromOccludedTransitionInteractor =

            FromOccludedTransitionInteractor(

                    scope = testScope,

                    bgDispatcher = testDispatcher,

                    mainDispatcher = testDispatcher,

                    bgDispatcher = kosmos.testDispatcher,

                    mainDispatcher = kosmos.testDispatcher,

                    keyguardInteractor = keyguardInteractor,

                    transitionRepository = transitionRepository,

                    transitionInteractor = transitionInteractor,
@@ -269,8 +273,8 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { 
        fromAlternateBouncerTransitionInteractor =

            FromAlternateBouncerTransitionInteractor(

                    scope = testScope,

                    bgDispatcher = testDispatcher,

                    mainDispatcher = testDispatcher,

                    bgDispatcher = kosmos.testDispatcher,

                    mainDispatcher = kosmos.testDispatcher,

                    keyguardInteractor = keyguardInteractor,

                    transitionRepository = transitionRepository,

                    transitionInteractor = transitionInteractor,
@@ -281,8 +285,8 @@ class KeyguardTransitionScenariosTest : SysuiTestCase() { 
        fromGlanceableHubTransitionInteractor =

            FromGlanceableHubTransitionInteractor(

                    scope = testScope,

                    bgDispatcher = testDispatcher,

                    mainDispatcher = testDispatcher,

                    bgDispatcher = kosmos.testDispatcher,

                    mainDispatcher = kosmos.testDispatcher,

                    glanceableHubTransitions = glanceableHubTransitions,

                    transitionRepository = transitionRepository,

                    transitionInteractor = transitionInteractor,

packages/SystemUI/tests/src/com/android/systemui/media/controls/ui/MediaHierarchyManagerTest.kt

+5 −6
Original line number Diff line number Diff line
@@ -25,8 +25,7 @@ import android.widget.FrameLayout 
import androidx.test.filters.SmallTest

import com.android.keyguard.KeyguardViewController

import com.android.systemui.SysuiTestCase

import com.android.systemui.communal.data.repository.FakeCommunalRepository

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

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

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

import com.android.systemui.controls.controller.ControlsControllerImplTest.Companion.eq

import com.android.systemui.dreams.DreamOverlayStateController
@@ -43,6 +42,7 @@ import com.android.systemui.statusbar.phone.KeyguardBypassController 
import com.android.systemui.statusbar.policy.FakeConfigurationController

import com.android.systemui.statusbar.policy.KeyguardStateController

import com.android.systemui.statusbar.policy.ResourcesSplitShadeStateController

import com.android.systemui.testKosmos

import com.android.systemui.util.animation.UniqueObjectHostView

import com.android.systemui.util.mockito.any

import com.android.systemui.util.mockito.mock
@@ -79,6 +79,8 @@ import org.mockito.junit.MockitoJUnit 
@TestableLooper.RunWithLooper(setAsMainLooper = true)

class MediaHierarchyManagerTest : SysuiTestCase() {



    private val kosmos = testKosmos()



    @Mock private lateinit var lockHost: MediaHost

    @Mock private lateinit var qsHost: MediaHost

    @Mock private lateinit var qqsHost: MediaHost
@@ -110,10 +112,7 @@ class MediaHierarchyManagerTest : SysuiTestCase() { 
    private lateinit var isQsBypassingShade: MutableStateFlow<Boolean>

    private lateinit var mediaFrame: ViewGroup

    private val configurationController = FakeConfigurationController()

    private val communalRepository =

        FakeCommunalRepository(applicationScope = testScope.backgroundScope)

    private val communalInteractor =

        CommunalInteractorFactory.create(communalRepository = communalRepository).communalInteractor

    private val communalInteractor = kosmos.communalInteractor

    private val settings = FakeSettings()

    private lateinit var testableLooper: TestableLooper

    private lateinit var fakeHandler: FakeHandler

packages/SystemUI/tests/src/com/android/systemui/shade/GlanceableHubContainerControllerTest.kt

+7 −4
Original line number Diff line number Diff line
@@ -25,14 +25,16 @@ import android.view.View 
import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.communal.data.repository.FakeCommunalRepository

import com.android.systemui.communal.data.repository.fakeCommunalRepository

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

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

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

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

import com.android.systemui.communal.ui.viewmodel.CommunalViewModel

import com.android.systemui.compose.ComposeFacade

import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor

import com.android.systemui.res.R

import com.android.systemui.shade.domain.interactor.ShadeInteractor

import com.android.systemui.testKosmos

import com.android.systemui.util.mockito.any

import com.android.systemui.util.mockito.whenever

import com.google.common.truth.Truth.assertThat
@@ -52,6 +54,8 @@ import org.mockito.MockitoAnnotations 
@TestableLooper.RunWithLooper(setAsMainLooper = true)

@SmallTest

class GlanceableHubContainerControllerTest : SysuiTestCase() {

    private val kosmos = testKosmos()



    @Mock private lateinit var communalViewModel: CommunalViewModel

    @Mock private lateinit var keyguardTransitionInteractor: KeyguardTransitionInteractor

    @Mock private lateinit var shadeInteractor: ShadeInteractor
@@ -71,9 +75,8 @@ class GlanceableHubContainerControllerTest : SysuiTestCase() { 
    fun setUp() {

        MockitoAnnotations.initMocks(this)



        val withDeps = CommunalInteractorFactory.create()

        communalInteractor = withDeps.communalInteractor

        communalRepository = withDeps.communalRepository

        communalInteractor = kosmos.communalInteractor

        communalRepository = kosmos.fakeCommunalRepository



        underTest =

            GlanceableHubContainerController(