Merge changes Id1ecee47,I4a5e4f70 into main (a4865c33) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/data/repository/CommunalMediaRepositoryImplTest.kt

+13 −11

Original line number	Diff line number	Diff line
		@@ -20,6 +20,7 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
		import androidx.test.filters.SmallTest
		import com.android.systemui.SysuiTestCase
		import com.android.systemui.coroutines.collectLastValue
		import com.android.systemui.log.table.TableLogBuffer
		import com.android.systemui.media.controls.models.player.MediaData
		import com.android.systemui.media.controls.pipeline.MediaDataManager
		import com.android.systemui.util.mockito.KotlinArgumentCaptor
		@@ -44,27 +45,32 @@ import org.mockito.MockitoAnnotations
		class CommunalMediaRepositoryImplTest : SysuiTestCase() {
		@Mock private lateinit var mediaDataManager: MediaDataManager
		@Mock private lateinit var mediaData: MediaData
		@Mock private lateinit var tableLogBuffer: TableLogBuffer

		private lateinit var underTest: CommunalMediaRepositoryImpl

		private val mediaDataListenerCaptor: KotlinArgumentCaptor<MediaDataManager.Listener> by lazy {
		KotlinArgumentCaptor(MediaDataManager.Listener::class.java)
		}

		private lateinit var mediaRepository: CommunalMediaRepository

		private val testDispatcher = StandardTestDispatcher()
		private val testScope = TestScope(testDispatcher)

		@Before
		fun setUp() {
		MockitoAnnotations.initMocks(this)

		underTest =
		CommunalMediaRepositoryImpl(
		mediaDataManager,
		tableLogBuffer,
		)
		}

		@Test
		fun hasAnyMediaOrRecommendation_defaultsToFalse() =
		testScope.runTest {
		mediaRepository = CommunalMediaRepositoryImpl(mediaDataManager)

		val mediaModel = collectLastValue(mediaRepository.mediaModel)
		val mediaModel = collectLastValue(underTest.mediaModel)
		runCurrent()
		assertThat(mediaModel()?.hasAnyMediaOrRecommendation).isFalse()
		}
		@@ -72,13 +78,11 @@ class CommunalMediaRepositoryImplTest : SysuiTestCase() {
		@Test
		fun mediaModel_updatesWhenMediaDataLoaded() =
		testScope.runTest {
		mediaRepository = CommunalMediaRepositoryImpl(mediaDataManager)

		// Listener is added
		verify(mediaDataManager).addListener(mediaDataListenerCaptor.capture())

		// Initial value is false.
		val mediaModel = collectLastValue(mediaRepository.mediaModel)
		val mediaModel = collectLastValue(underTest.mediaModel)
		runCurrent()
		assertThat(mediaModel()?.hasAnyMediaOrRecommendation).isFalse()

		@@ -96,8 +100,6 @@ class CommunalMediaRepositoryImplTest : SysuiTestCase() {
		@Test
		fun mediaModel_updatesWhenMediaDataRemoved() =
		testScope.runTest {
		mediaRepository = CommunalMediaRepositoryImpl(mediaDataManager)

		// Listener is added
		verify(mediaDataManager).addListener(mediaDataListenerCaptor.capture())

		@@ -107,7 +109,7 @@ class CommunalMediaRepositoryImplTest : SysuiTestCase() {
		runCurrent()

		// Media active now returns true.
		val mediaModel = collectLastValue(mediaRepository.mediaModel)
		val mediaModel = collectLastValue(underTest.mediaModel)
		assertThat(mediaModel()?.hasAnyMediaOrRecommendation).isTrue()

		// Change to media unavailable and notify the listener.

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/data/repository/CommunalPrefsRepositoryImplTest.kt

+10 −0

Original line number	Diff line number	Diff line
		@@ -25,6 +25,8 @@ import com.android.systemui.communal.data.repository.CommunalPrefsRepositoryImpl
		import com.android.systemui.coroutines.collectLastValue
		import com.android.systemui.kosmos.testDispatcher
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.log.logcatLogBuffer
		import com.android.systemui.log.table.TableLogBuffer
		import com.android.systemui.settings.UserFileManager
		import com.android.systemui.testKosmos
		import com.android.systemui.user.data.repository.FakeUserRepository
		@@ -36,11 +38,15 @@ import kotlinx.coroutines.test.runTest
		import org.junit.Before
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.mockito.Mock
		import org.mockito.MockitoAnnotations

		@SmallTest
		@RunWith(AndroidJUnit4::class)
		@android.platform.test.annotations.EnabledOnRavenwood
		class CommunalPrefsRepositoryImplTest : SysuiTestCase() {
		@Mock private lateinit var tableLogBuffer: TableLogBuffer

		private lateinit var underTest: CommunalPrefsRepositoryImpl

		private val kosmos = testKosmos()
		@@ -51,6 +57,8 @@ class CommunalPrefsRepositoryImplTest : SysuiTestCase() {

		@Before
		fun setUp() {
		MockitoAnnotations.initMocks(this)

		userRepository = kosmos.fakeUserRepository
		userRepository.setUserInfos(USER_INFOS)

		@@ -67,6 +75,8 @@ class CommunalPrefsRepositoryImplTest : SysuiTestCase() {
		kosmos.testDispatcher,
		userRepository,
		userFileManager,
		logcatLogBuffer("CommunalPrefsRepositoryImplTest"),
		tableLogBuffer,
		)
		}

packages/SystemUI/multivalentTests/src/com/android/systemui/communal/data/repository/CommunalTutorialRepositoryImplTest.kt

+5 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import com.android.systemui.kosmos.applicationCoroutineScope
		import com.android.systemui.kosmos.testDispatcher
		import com.android.systemui.kosmos.testScope
		import com.android.systemui.log.logcatLogBuffer
		import com.android.systemui.log.table.TableLogBuffer
		import com.android.systemui.testKosmos
		import com.android.systemui.user.data.repository.FakeUserRepository
		import com.android.systemui.util.settings.FakeSettings
		@@ -34,12 +35,15 @@ import kotlinx.coroutines.test.runTest
		import org.junit.Before
		import org.junit.Test
		import org.junit.runner.RunWith
		import org.mockito.Mock
		import org.mockito.MockitoAnnotations

		@SmallTest
		@RunWith(AndroidJUnit4::class)
		@android.platform.test.annotations.EnabledOnRavenwood
		class CommunalTutorialRepositoryImplTest : SysuiTestCase() {
		@Mock private lateinit var tableLogBuffer: TableLogBuffer

		private val kosmos = testKosmos()
		private val testScope = kosmos.testScope

		@@ -64,6 +68,7 @@ class CommunalTutorialRepositoryImplTest : SysuiTestCase() {
		userRepository,
		secureSettings,
		logcatLogBuffer("CommunalTutorialRepositoryImplTest"),
		tableLogBuffer,
		)
		}

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ 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.kosmos.testScope
		import com.android.systemui.log.logcatLogBuffer
		import com.android.systemui.media.controls.ui.MediaHost
		import com.android.systemui.smartspace.data.repository.FakeSmartspaceRepository
		import com.android.systemui.smartspace.data.repository.fakeSmartspaceRepository
		@@ -82,6 +83,7 @@ class CommunalEditModeViewModelTest : SysuiTestCase() {
		kosmos.communalInteractor,
		mediaHost,
		uiEventLogger,
		logcatLogBuffer("CommunalEditModeViewModelTest"),
		)
		}

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ 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.log.logcatLogBuffer
		import com.android.systemui.media.controls.ui.MediaHierarchyManager
		import com.android.systemui.media.controls.ui.MediaHost
		import com.android.systemui.smartspace.data.repository.FakeSmartspaceRepository
		@@ -99,6 +100,7 @@ class CommunalViewModelTest : SysuiTestCase() {
		kosmos.communalInteractor,
		kosmos.communalTutorialInteractor,
		mediaHost,
		logcatLogBuffer("CommunalViewModelTest"),
		)
		}