Merge "Fix test failures due to flexi and media compose dependency" into main (2dfc4d6d) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/media/controls/ui/viewmodel/MediaCarouselViewModelTest.kt

+5 −0

Original line number	Diff line number	Diff line
		@@ -19,11 +19,14 @@ package com.android.systemui.media.controls.ui.viewmodel
		import android.R
		import android.content.packageManager
		import android.content.pm.ApplicationInfo
		import android.platform.test.annotations.DisableFlags
		import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.internal.logging.InstanceId
		import com.android.systemui.Flags
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.coroutines.collectLastValue
		import com.android.systemui.flags.DisableSceneContainer
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.media.controls.domain.pipeline.MediaDataFilterImpl
		import com.android.systemui.media.controls.domain.pipeline.interactor.mediaCarouselInteractor
		@@ -49,6 +52,8 @@ import org.mockito.kotlin.verify

		@SmallTest
		@RunWith(AndroidJUnit4::class)
		@DisableFlags(Flags.FLAG_MEDIA_CONTROLS_IN_COMPOSE)
		@DisableSceneContainer
		class MediaCarouselViewModelTest : SysuiTestCase() {

		private val kosmos = testKosmos().apply { mediaLogger = mockMediaLogger }

+4 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import com.android.systemui.media.controls.ui.controller.mediaCarouselController
		import com.android.systemui.media.controls.ui.view.MediaHostState
		import com.android.systemui.media.controls.ui.view.qqsMediaHost
		import com.android.systemui.media.controls.ui.view.qsMediaHost
		import com.android.systemui.media.remedia.data.repository.setHasMedia
		import com.android.systemui.qs.composefragment.viewmodel.MediaState.ACTIVE_MEDIA
		import com.android.systemui.qs.composefragment.viewmodel.MediaState.ANY_MEDIA
		import com.android.systemui.qs.composefragment.viewmodel.MediaState.NO_MEDIA
		@@ -568,9 +569,12 @@ class QSFragmentComposeViewModelTest : AbstractQSFragmentComposeViewModelTest()
		with(kosmos) {
		val activeMedia = state == ACTIVE_MEDIA
		val anyMedia = state != NO_MEDIA
		setHasMedia(visible = anyMedia, active = activeMedia)
		whenever(legacyMediaDataManagerImpl.hasActiveMedia()).thenReturn(activeMedia)
		whenever(legacyMediaDataManagerImpl.hasAnyMedia()).thenReturn(anyMedia)
		qqsMediaHost.showsOnlyActiveMedia = true
		qqsMediaHost.updateViewVisibility()
		qsMediaHost.showsOnlyActiveMedia = false
		qsMediaHost.updateViewVisibility()
		}
		runCurrent()

+2 −2

Original line number	Diff line number	Diff line
		@@ -32,7 +32,7 @@ import com.android.systemui.media.controls.ui.controller.MediaHierarchyManager.C
		import com.android.systemui.media.controls.ui.controller.MediaLocation
		import com.android.systemui.media.controls.ui.controller.mediaHostStatesManager
		import com.android.systemui.media.controls.ui.view.MediaHost
		import com.android.systemui.media.remedia.data.repository.setHasActiveMedia
		import com.android.systemui.media.remedia.data.repository.setHasMedia
		import com.android.systemui.media.remedia.shared.flag.MediaControlsInComposeFlag
		import com.android.systemui.media.remedia.ui.compose.MediaUiBehavior
		import com.android.systemui.qs.composefragment.dagger.usingMediaInComposeFragment
		@@ -105,7 +105,7 @@ class MediaInRowInLandscapeViewModelTest(
		fakeConfigurationRepository.onConfigurationChange(config)
		mainResources.configuration.updateFrom(config)
		if (MediaControlsInComposeFlag.isEnabled) {
		setHasActiveMedia(testData.mediaVisible)
		setHasMedia(testData.mediaVisible)
		} else {
		mediaHostStatesManager.updateHostState(
		testData.mediaLocation,

+4 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ import com.android.systemui.media.controls.ui.controller.MediaHierarchyManager.C
		import com.android.systemui.media.controls.ui.controller.MediaLocation
		import com.android.systemui.media.controls.ui.controller.mediaHostStatesManager
		import com.android.systemui.media.controls.ui.view.MediaHost
		import com.android.systemui.media.remedia.data.repository.setHasMedia
		import com.android.systemui.qs.composefragment.dagger.usingMediaInComposeFragment
		import com.android.systemui.qs.panels.data.repository.QSColumnsRepository
		import com.android.systemui.qs.panels.data.repository.qsColumnsRepository
		@@ -331,6 +332,9 @@ class QSColumnsViewModelTest : SysuiTestCase() {
		location,
		MediaHost.MediaHostStateHolder().apply { this.visible = visible },
		)

		// Active media will appear either in QQS or QS.
		setHasMedia(visible)
		}
		}
		}

+2 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ import com.android.systemui.media.controls.ui.controller.MediaHierarchyManager.C
		import com.android.systemui.media.controls.ui.controller.MediaLocation
		import com.android.systemui.media.controls.ui.controller.mediaHostStatesManager
		import com.android.systemui.media.controls.ui.view.MediaHost
		import com.android.systemui.media.remedia.data.repository.setHasMedia
		import com.android.systemui.qs.composefragment.dagger.usingMediaInComposeFragment
		import com.android.systemui.qs.panels.domain.interactor.qsPreferencesInteractor
		import com.android.systemui.qs.pipeline.domain.interactor.currentTilesInteractor
		@@ -200,6 +201,7 @@ class QuickQuickSettingsViewModelTest : SysuiTestCase() {
		location,
		MediaHost.MediaHostStateHolder().apply { this.visible = visible },
		)
		setHasMedia(true)
		}
		}
		}