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

Commit be1ba191 authored by Anton Potapov's avatar Anton Potapov Committed by Android (Google) Code Review
Browse files

Merge "Update Volume Panel Kosmos" into main

parents e30ffaa2 b79ef07f

packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/component/bottombar/ui/viewmodel/BottomBarViewModelTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import com.android.systemui.testKosmos 
import com.android.systemui.util.mockito.capture

import com.android.systemui.util.mockito.eq

import com.android.systemui.volume.panel.ui.VolumePanelUiEvent

import com.android.systemui.volume.panel.volumePanelViewModel

import com.android.systemui.volume.panel.ui.viewmodel.volumePanelViewModel

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

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.runCurrent

packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/domain/interactor/ComponentsInteractorImplTest.kt

+11 −11
Original line number Diff line number Diff line
@@ -22,14 +22,14 @@ import com.android.systemui.SysuiTestCase 
import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.kosmos.Kosmos

import com.android.systemui.kosmos.testScope

import com.android.systemui.volume.panel.availableCriteria

import com.android.systemui.volume.panel.criteriaByKey

import com.android.systemui.volume.panel.defaultCriteria

import com.android.systemui.volume.panel.domain.availableCriteria

import com.android.systemui.volume.panel.domain.defaultCriteria

import com.android.systemui.volume.panel.domain.model.ComponentModel

import com.android.systemui.volume.panel.enabledComponents

import com.android.systemui.volume.panel.domain.unavailableCriteria

import com.android.systemui.volume.panel.shared.model.VolumePanelComponentKey

import com.android.systemui.volume.panel.unavailableCriteria

import com.android.systemui.volume.panel.ui.composable.enabledComponents

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

import javax.inject.Provider

import kotlinx.coroutines.test.runTest

import org.junit.Test

import org.junit.runner.RunWith
@@ -47,7 +47,7 @@ class ComponentsInteractorImplTest : SysuiTestCase() { 
            with(kosmos) {

                ComponentsInteractorImpl(

                    enabledComponents,

                    defaultCriteria,

                    { defaultCriteria },

                    testScope.backgroundScope,

                    criteriaByKey,

                )
@@ -66,9 +66,9 @@ class ComponentsInteractorImplTest : SysuiTestCase() { 
                    )

                criteriaByKey =

                    mapOf(

                        BOTTOM_BAR to availableCriteria,

                        COMPONENT_1 to unavailableCriteria,

                        COMPONENT_2 to availableCriteria,

                        BOTTOM_BAR to Provider { availableCriteria },

                        COMPONENT_1 to Provider { unavailableCriteria },

                        COMPONENT_2 to Provider { availableCriteria },

                    )

                initUnderTest()
@@ -96,8 +96,8 @@ class ComponentsInteractorImplTest : SysuiTestCase() { 
                    )

                criteriaByKey =

                    mapOf(

                        BOTTOM_BAR to availableCriteria,

                        COMPONENT_2 to availableCriteria,

                        BOTTOM_BAR to Provider { availableCriteria },

                        COMPONENT_2 to Provider { availableCriteria },

                    )

                defaultCriteria = unavailableCriteria

                initUnderTest()

packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/ui/composable/ComponentsFactoryTest.kt

+1 −2
Original line number Diff line number Diff line
@@ -20,9 +20,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 
import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.testKosmos

import com.android.systemui.volume.panel.componentByKey

import com.android.systemui.volume.panel.mockVolumePanelUiComponentProvider

import com.android.systemui.volume.panel.shared.model.VolumePanelComponentKey

import com.android.systemui.volume.panel.shared.model.mockVolumePanelUiComponentProvider

import com.google.common.truth.Truth

import org.junit.Test

import org.junit.runner.RunWith

packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/ui/viewmodel/DefaultComponentsLayoutManagerTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4 
import androidx.test.filters.SmallTest

import com.android.systemui.SysuiTestCase

import com.android.systemui.testKosmos

import com.android.systemui.volume.panel.mockVolumePanelUiComponent

import com.android.systemui.volume.panel.shared.model.VolumePanelComponentKey

import com.android.systemui.volume.panel.shared.model.mockVolumePanelUiComponent

import com.android.systemui.volume.panel.ui.layout.ComponentsLayoutManager

import com.android.systemui.volume.panel.ui.layout.DefaultComponentsLayoutManager

import com.google.common.truth.Truth

packages/SystemUI/multivalentTests/src/com/android/systemui/volume/panel/ui/viewmodel/VolumePanelViewModelTest.kt

+7 −7
Original line number Diff line number Diff line
@@ -28,15 +28,15 @@ import com.android.systemui.kosmos.Kosmos 
import com.android.systemui.kosmos.testScope

import com.android.systemui.statusbar.policy.fakeConfigurationController

import com.android.systemui.testKosmos

import com.android.systemui.volume.panel.componentByKey

import com.android.systemui.volume.panel.componentsLayoutManager

import com.android.systemui.volume.panel.criteriaByKey

import com.android.systemui.volume.panel.mockVolumePanelUiComponentProvider

import com.android.systemui.volume.panel.domain.interactor.criteriaByKey

import com.android.systemui.volume.panel.domain.unavailableCriteria

import com.android.systemui.volume.panel.shared.model.VolumePanelComponentKey

import com.android.systemui.volume.panel.shared.model.mockVolumePanelUiComponentProvider

import com.android.systemui.volume.panel.ui.composable.componentByKey

import com.android.systemui.volume.panel.ui.layout.DefaultComponentsLayoutManager

import com.android.systemui.volume.panel.unavailableCriteria

import com.android.systemui.volume.panel.volumePanelViewModel

import com.android.systemui.volume.panel.ui.layout.componentsLayoutManager

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

import javax.inject.Provider

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.runCurrent

import kotlinx.coroutines.test.runTest
@@ -95,7 +95,7 @@ class VolumePanelViewModelTest : SysuiTestCase() { 
                    COMPONENT_2 to mockVolumePanelUiComponentProvider,

                    BOTTOM_BAR to mockVolumePanelUiComponentProvider,

                )

            criteriaByKey = mapOf(COMPONENT_2 to unavailableCriteria)

            criteriaByKey = mapOf(COMPONENT_2 to Provider { unavailableCriteria })

        }) {

            testScope.runTest {

                val componentsLayout by collectLastValue(underTest.componentsLayout)