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

Commit 8d5b191d authored by Fabián Kozynski's avatar Fabián Kozynski
Browse files

Fix Kosmos for NewQSTileFactory (1/2) 

This fixes it by using a really bare QSTileViewModel. We need a better
solution that uses the other kosmos dependencies, but this helps unblock
failing tests.

Bug: 339879389
Test: atest EditModeViewModelTest with flag on
Flag: ACONFIG com.android.systemui.qs_new_tiles DISABLED
Change-Id: If65e8afc706058600e89bbde89bc40c3ebab8e93
parent 759538ca

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/custom/data/repository/CustomTileRepositoryTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -30,10 +30,10 @@ import com.android.systemui.qs.external.TileServiceKey 
import com.android.systemui.qs.pipeline.shared.TileSpec

import com.android.systemui.qs.tiles.impl.custom.TileSubject.Companion.assertThat

import com.android.systemui.qs.tiles.impl.custom.commons.copy

import com.android.systemui.qs.tiles.impl.custom.customTileSpec

import com.android.systemui.qs.tiles.impl.custom.customTileStatePersister

import com.android.systemui.qs.tiles.impl.custom.data.entity.CustomTileDefaults

import com.android.systemui.qs.tiles.impl.custom.packageManagerAdapterFacade

import com.android.systemui.qs.tiles.impl.custom.tileSpec

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

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.first
@@ -47,11 +47,11 @@ import org.junit.runner.RunWith 
@OptIn(ExperimentalCoroutinesApi::class)

class CustomTileRepositoryTest : SysuiTestCase() {



    private val kosmos = Kosmos().apply { tileSpec = TileSpec.create(TEST_COMPONENT) }

    private val kosmos = Kosmos().apply { customTileSpec = TileSpec.create(TEST_COMPONENT) }

    private val underTest: CustomTileRepository =

        with(kosmos) {

            CustomTileRepositoryImpl(

                tileSpec,

                customTileSpec,

                customTileStatePersister,

                packageManagerAdapterFacade.packageManagerAdapter,

                testScope.testScheduler,

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/custom/domain/interactor/CustomTileDataInteractorTest.kt

+6 −6
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ import com.android.systemui.qs.tiles.impl.custom.customTileInteractor 
import com.android.systemui.qs.tiles.impl.custom.customTilePackagesUpdatesRepository

import com.android.systemui.qs.tiles.impl.custom.customTileRepository

import com.android.systemui.qs.tiles.impl.custom.customTileServiceInteractor

import com.android.systemui.qs.tiles.impl.custom.customTileSpec

import com.android.systemui.qs.tiles.impl.custom.data.entity.CustomTileDefaults

import com.android.systemui.qs.tiles.impl.custom.tileSpec

import com.android.systemui.testKosmos

import com.android.systemui.user.data.repository.fakeUserRepository

import com.android.systemui.user.data.repository.userRepository
@@ -60,12 +60,12 @@ class CustomTileDataInteractorTest : SysuiTestCase() { 
    private val kosmos =

        testKosmos().apply {

            componentName = TEST_COMPONENT

            tileSpec = TileSpec.create(componentName)

            customTileSpec = TileSpec.create(componentName)

        }

    private val underTest =

        with(kosmos) {

            CustomTileDataInteractor(

                tileSpec = tileSpec,

                tileSpec = customTileSpec,

                defaultsRepository = customTileDefaultsRepository,

                serviceInteractor = customTileServiceInteractor,

                customTileInteractor = customTileInteractor,
@@ -180,7 +180,7 @@ class CustomTileDataInteractorTest : SysuiTestCase() { 
                setup()

                customTileDefaultsRepository.putDefaults(

                    TEST_USER_1.userHandle,

                    tileSpec.componentName,

                    customTileSpec.componentName,

                    CustomTileDefaults.Result(TEST_TILE.icon, TEST_TILE.label),

                )
@@ -198,7 +198,7 @@ class CustomTileDataInteractorTest : SysuiTestCase() { 
                setup()

                customTileDefaultsRepository.putDefaults(

                    TEST_USER_1.userHandle,

                    tileSpec.componentName,

                    customTileSpec.componentName,

                    CustomTileDefaults.Error,

                )
@@ -216,7 +216,7 @@ class CustomTileDataInteractorTest : SysuiTestCase() { 
                setup()

                customTileDefaultsRepository.putDefaults(

                    TEST_USER_2.userHandle,

                    tileSpec.componentName,

                    customTileSpec.componentName,

                    CustomTileDefaults.Error,

                )

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/custom/domain/interactor/CustomTileInteractorTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -31,9 +31,9 @@ import com.android.systemui.qs.pipeline.shared.TileSpec 
import com.android.systemui.qs.tiles.impl.custom.TileSubject.Companion.assertThat

import com.android.systemui.qs.tiles.impl.custom.customTileDefaultsRepository

import com.android.systemui.qs.tiles.impl.custom.customTileRepository

import com.android.systemui.qs.tiles.impl.custom.customTileSpec

import com.android.systemui.qs.tiles.impl.custom.customTileStatePersister

import com.android.systemui.qs.tiles.impl.custom.data.entity.CustomTileDefaults

import com.android.systemui.qs.tiles.impl.custom.tileSpec

import com.android.systemui.testKosmos

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

import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -50,12 +50,12 @@ import org.junit.runner.RunWith 
@OptIn(ExperimentalCoroutinesApi::class)

class CustomTileInteractorTest : SysuiTestCase() {



    private val kosmos = testKosmos().apply { tileSpec = TileSpec.create(TEST_COMPONENT) }

    private val kosmos = testKosmos().apply { customTileSpec = TileSpec.create(TEST_COMPONENT) }



    private val underTest: CustomTileInteractor =

        with(kosmos) {

            CustomTileInteractor(

                tileSpec = tileSpec,

                tileSpec = customTileSpec,

                defaultsRepository = customTileDefaultsRepository,

                customTileRepository = customTileRepository,

                tileScope = testScope.backgroundScope,

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/custom/domain/interactor/CustomTileMapperTest.kt

+4 −3
Original line number Diff line number Diff line
@@ -33,9 +33,9 @@ import com.android.systemui.kosmos.testScope 
import com.android.systemui.qs.pipeline.shared.TileSpec

import com.android.systemui.qs.tiles.impl.custom.QSTileStateSubject.Companion.assertThat

import com.android.systemui.qs.tiles.impl.custom.customTileQsTileConfig

import com.android.systemui.qs.tiles.impl.custom.customTileSpec

import com.android.systemui.qs.tiles.impl.custom.domain.CustomTileMapper

import com.android.systemui.qs.tiles.impl.custom.domain.entity.CustomTileDataModel

import com.android.systemui.qs.tiles.impl.custom.tileSpec

import com.android.systemui.qs.tiles.viewmodel.QSTileState

import com.android.systemui.testKosmos

import com.android.systemui.util.mockito.any
@@ -51,7 +51,8 @@ import org.junit.runner.RunWith 
class CustomTileMapperTest : SysuiTestCase() {



    private val uriGrantsManager: IUriGrantsManager = mock {}

    private val kosmos = testKosmos().apply { tileSpec = TileSpec.Companion.create(TEST_COMPONENT) }

    private val kosmos =

        testKosmos().apply { customTileSpec = TileSpec.Companion.create(TEST_COMPONENT) }

    private val underTest by lazy {

        CustomTileMapper(

            context = mock { whenever(createContextAsUser(any(), any())).thenReturn(context) },
@@ -202,7 +203,7 @@ class CustomTileMapperTest : SysuiTestCase() { 
    ) =

        CustomTileDataModel(

            UserHandle.of(1),

            tileSpec.componentName,

            customTileSpec.componentName,

            Tile().apply {

                state = tileState

                label = "test label"

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/tiles/impl/custom/domain/interactor/CustomTileUserActionInteractorTest.kt

+4 −4
Original line number Diff line number Diff line
@@ -44,9 +44,9 @@ import com.android.systemui.qs.tiles.base.actions.pendingIntentInputs 
import com.android.systemui.qs.tiles.base.interactor.QSTileInputTestKtx.click

import com.android.systemui.qs.tiles.base.interactor.QSTileInputTestKtx.longClick

import com.android.systemui.qs.tiles.impl.custom.customTileServiceInteractor

import com.android.systemui.qs.tiles.impl.custom.customTileSpec

import com.android.systemui.qs.tiles.impl.custom.domain.entity.CustomTileDataModel

import com.android.systemui.qs.tiles.impl.custom.qsTileLogger

import com.android.systemui.qs.tiles.impl.custom.tileSpec

import com.android.systemui.testKosmos

import com.android.systemui.user.data.repository.fakeUserRepository

import com.android.systemui.util.mockito.any
@@ -68,7 +68,7 @@ class CustomTileUserActionInteractorTest : SysuiTestCase() { 
    private val kosmos =

        testKosmos().apply {

            componentName = TEST_COMPONENT

            tileSpec = TileSpec.create(componentName)

            customTileSpec = TileSpec.create(componentName)

            testCase = this@CustomTileUserActionInteractorTest

        }
@@ -79,7 +79,7 @@ class CustomTileUserActionInteractorTest : SysuiTestCase() { 
                    mock {

                        whenever(packageManager).thenReturn(packageManagerFacade.packageManager)

                    },

                tileSpec = tileSpec,

                tileSpec = customTileSpec,

                qsTileLogger = qsTileLogger,

                windowManager = windowManagerFacade.windowManager,

                displayTracker = mock {},
@@ -227,7 +227,7 @@ class CustomTileUserActionInteractorTest : SysuiTestCase() { 
    private fun pendingIntent(): PendingIntent = mock { whenever(isActivity).thenReturn(true) }



    private fun Kosmos.customTileModel(

        componentName: ComponentName = tileSpec.componentName,

        componentName: ComponentName = customTileSpec.componentName,

        activityLaunchForClick: PendingIntent? = null,

        tileState: Int = 111,

    ) =