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

Commit 4e76305c authored by Lucas Silva's avatar Lucas Silva Committed by Android (Google) Code Review
Browse files

Merge "Remove duplicate CommunalInteractor kosmos providers" into main

parents 5c2532bd 3b5d8b97

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/domain/interactor/CommunalInteractorCommunalDisabledTest.kt

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ import com.android.systemui.communal.data.repository.fakeCommunalWidgetRepositor 
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.keyguard.domain.interactor.communalInteractor

import com.android.systemui.kosmos.testScope

import com.android.systemui.testKosmos

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

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/domain/interactor/CommunalInteractorTest.kt

+0 −2
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ import com.android.systemui.communal.widgets.EditWidgetsActivityStarter 
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.keyguard.domain.interactor.communalInteractor

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

import com.android.systemui.kosmos.testScope

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

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

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/log/CommunalLoggerStartableTest.kt

+7 −7
Original line number Diff line number Diff line
@@ -21,14 +21,15 @@ import androidx.test.filters.SmallTest 
import com.android.internal.logging.UiEventLogger

import com.android.systemui.SysuiTestCase

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.log.CommunalUiEvent

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

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

import com.android.systemui.kosmos.testScope

import com.android.systemui.testKosmos

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.MutableStateFlow

import kotlinx.coroutines.flow.emptyFlow

import kotlinx.coroutines.test.TestScope

import kotlinx.coroutines.test.runCurrent

import kotlinx.coroutines.test.runTest

import org.junit.Before
@@ -47,17 +48,16 @@ import org.mockito.MockitoAnnotations 
class CommunalLoggerStartableTest : SysuiTestCase() {

    @Mock private lateinit var uiEventLogger: UiEventLogger



    private lateinit var testScope: TestScope

    private val kosmos = testKosmos()

    private val testScope = kosmos.testScope



    private lateinit var communalInteractor: CommunalInteractor

    private lateinit var underTest: CommunalLoggerStartable



    @Before

    fun setUp() {

        MockitoAnnotations.initMocks(this)



        val withDeps = CommunalInteractorFactory.create()

        testScope = withDeps.testScope

        communalInteractor = withDeps.communalInteractor

        communalInteractor = kosmos.communalInteractor



        underTest =

            CommunalLoggerStartable(

packages/SystemUI/tests/utils/src/com/android/systemui/communal/domain/interactor/CommunalInteractorKosmos.kt

+4 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import com.android.systemui.communal.data.repository.communalMediaRepository 
import com.android.systemui.communal.data.repository.communalPrefsRepository

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

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

import com.android.systemui.communal.widgets.EditWidgetsActivityStarter

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

import com.android.systemui.kosmos.Kosmos

import com.android.systemui.kosmos.Kosmos.Fixture
@@ -37,6 +38,8 @@ val Kosmos.communalInteractor by Fixture { 
        smartspaceRepository = smartspaceRepository,

        appWidgetHost = mock(),

        keyguardInteractor = keyguardInteractor,

        editWidgetsActivityStarter = mock(),

        editWidgetsActivityStarter = editWidgetsActivityStarter,

    )

}



val Kosmos.editWidgetsActivityStarter by Fixture<EditWidgetsActivityStarter> { mock() }

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

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.keyguard.domain.interactor



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

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

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

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

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

import com.android.systemui.communal.widgets.CommunalAppWidgetHost

import com.android.systemui.communal.widgets.EditWidgetsActivityStarter

import com.android.systemui.kosmos.Kosmos

import com.android.systemui.kosmos.applicationCoroutineScope

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

import org.mockito.Mockito.mock



val Kosmos.communalInteractor by

    Kosmos.Fixture {

        CommunalInteractor(

            applicationScope = applicationCoroutineScope,

            communalRepository = communalRepository,

            widgetRepository = communalWidgetRepository,

            mediaRepository = communalMediaRepository,

            communalPrefsRepository = communalPrefsRepository,

            smartspaceRepository = smartspaceRepository,

            keyguardInteractor = keyguardInteractor,

            appWidgetHost = mock(CommunalAppWidgetHost::class.java),

            editWidgetsActivityStarter = editWidgetsActivityStarter,

        )

    }



val Kosmos.editWidgetsActivityStarter by

    Kosmos.Fixture<EditWidgetsActivityStarter> { mock(EditWidgetsActivityStarter::class.java) }