Merge "Introduce useUnconfinedTestDispatcher, etc, use them" into main (c6a025ef) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/display/data/repository/PerDisplayStoreImplTest.kt

+2 −3

packages/SystemUI/multivalentTests/src/com/android/systemui/keyguard/data/quickaffordance/KeyguardQuickAffordanceLegacySettingSyncerTest.kt

+17 −31

Original line number	Original line	Diff line number	Diff line
	@@ -23,8 +23,9 @@ import android.provider.Settings
	import androidx.test.ext.junit.runners.AndroidJUnit4		import androidx.test.ext.junit.runners.AndroidJUnit4
	import androidx.test.filters.SmallTest		import androidx.test.filters.SmallTest
	import com.android.systemui.SysuiTestCase		import com.android.systemui.SysuiTestCase
	import com.android.systemui.kosmos.unconfinedTestDispatcher		import com.android.systemui.kosmos.testDispatcher
	import com.android.systemui.kosmos.unconfinedTestScope		import com.android.systemui.kosmos.testScope
			import com.android.systemui.kosmos.useUnconfinedTestDispatcher
	import com.android.systemui.res.R		import com.android.systemui.res.R
	import com.android.systemui.settings.FakeUserTracker		import com.android.systemui.settings.FakeUserTracker
	import com.android.systemui.shared.keyguard.shared.model.KeyguardQuickAffordanceSlots		import com.android.systemui.shared.keyguard.shared.model.KeyguardQuickAffordanceSlots
	@@ -33,7 +34,7 @@ import com.android.systemui.util.FakeSharedPreferences
	import com.android.systemui.util.mockito.any		import com.android.systemui.util.mockito.any
	import com.android.systemui.util.mockito.mock		import com.android.systemui.util.mockito.mock
	import com.android.systemui.util.mockito.whenever		import com.android.systemui.util.mockito.whenever
	import com.android.systemui.util.settings.unconfinedDispatcherFakeSettings		import com.android.systemui.util.settings.fakeSettings
	import com.google.common.truth.Truth.assertThat		import com.google.common.truth.Truth.assertThat
	import kotlinx.coroutines.ExperimentalCoroutinesApi		import kotlinx.coroutines.ExperimentalCoroutinesApi
	import kotlinx.coroutines.test.advanceUntilIdle		import kotlinx.coroutines.test.advanceUntilIdle
	@@ -51,10 +52,10 @@ import org.mockito.MockitoAnnotations
	@RunWith(AndroidJUnit4::class)		@RunWith(AndroidJUnit4::class)
	class KeyguardQuickAffordanceLegacySettingSyncerTest : SysuiTestCase() {		class KeyguardQuickAffordanceLegacySettingSyncerTest : SysuiTestCase() {

	private val kosmos = testKosmos()		private val kosmos = testKosmos().useUnconfinedTestDispatcher()
	private val testDispatcher = kosmos.unconfinedTestDispatcher		private val testDispatcher = kosmos.testDispatcher
	private val testScope = kosmos.unconfinedTestScope		private val testScope = kosmos.testScope
	private val settings = kosmos.unconfinedDispatcherFakeSettings		private val settings = kosmos.fakeSettings

	@Mock private lateinit var sharedPrefs: FakeSharedPreferences		@Mock private lateinit var sharedPrefs: FakeSharedPreferences

	@@ -79,13 +80,7 @@ class KeyguardQuickAffordanceLegacySettingSyncerTest : SysuiTestCase() {
	context = context,		context = context,
	userFileManager =		userFileManager =
	mock {		mock {
	whenever(		whenever(getSharedPreferences(anyString(), anyInt(), anyInt()))
	getSharedPreferences(
	anyString(),
	anyInt(),
	anyInt(),
	)
	)
	.thenReturn(FakeSharedPreferences())		.thenReturn(FakeSharedPreferences())
	},		},
	userTracker = FakeUserTracker(),		userTracker = FakeUserTracker(),
	@@ -109,17 +104,14 @@ class KeyguardQuickAffordanceLegacySettingSyncerTest : SysuiTestCase() {
	testScope.runTest {		testScope.runTest {
	val job = underTest.startSyncing()		val job = underTest.startSyncing()

	settings.putInt(		settings.putInt(Settings.Secure.LOCKSCREEN_SHOW_CONTROLS, 1)
	Settings.Secure.LOCKSCREEN_SHOW_CONTROLS,
	1,
	)

	assertThat(		assertThat(
	selectionManager		selectionManager
	.getSelections()		.getSelections()
	.getOrDefault(		.getOrDefault(
	KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_START,		KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_START,
	emptyList()		emptyList(),
	)		)
	)		)
	.contains(BuiltInKeyguardQuickAffordanceKeys.HOME_CONTROLS)		.contains(BuiltInKeyguardQuickAffordanceKeys.HOME_CONTROLS)
	@@ -132,21 +124,15 @@ class KeyguardQuickAffordanceLegacySettingSyncerTest : SysuiTestCase() {
	testScope.runTest {		testScope.runTest {
	val job = underTest.startSyncing()		val job = underTest.startSyncing()

	settings.putInt(		settings.putInt(Settings.Secure.LOCKSCREEN_SHOW_CONTROLS, 1)
	Settings.Secure.LOCKSCREEN_SHOW_CONTROLS,		settings.putInt(Settings.Secure.LOCKSCREEN_SHOW_CONTROLS, 0)
	1,
	)
	settings.putInt(
	Settings.Secure.LOCKSCREEN_SHOW_CONTROLS,
	0,
	)

	assertThat(		assertThat(
	selectionManager		selectionManager
	.getSelections()		.getSelections()
	.getOrDefault(		.getOrDefault(
	KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_START,		KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_START,
	emptyList()		emptyList(),
	)		)
	)		)
	.doesNotContain(BuiltInKeyguardQuickAffordanceKeys.HOME_CONTROLS)		.doesNotContain(BuiltInKeyguardQuickAffordanceKeys.HOME_CONTROLS)
	@@ -161,7 +147,7 @@ class KeyguardQuickAffordanceLegacySettingSyncerTest : SysuiTestCase() {

	selectionManager.setSelections(		selectionManager.setSelections(
	KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_END,		KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_END,
	listOf(BuiltInKeyguardQuickAffordanceKeys.QUICK_ACCESS_WALLET)		listOf(BuiltInKeyguardQuickAffordanceKeys.QUICK_ACCESS_WALLET),
	)		)

	advanceUntilIdle()		advanceUntilIdle()
	@@ -177,11 +163,11 @@ class KeyguardQuickAffordanceLegacySettingSyncerTest : SysuiTestCase() {

	selectionManager.setSelections(		selectionManager.setSelections(
	KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_END,		KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_END,
	listOf(BuiltInKeyguardQuickAffordanceKeys.QUICK_ACCESS_WALLET)		listOf(BuiltInKeyguardQuickAffordanceKeys.QUICK_ACCESS_WALLET),
	)		)
	selectionManager.setSelections(		selectionManager.setSelections(
	KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_END,		KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_END,
	emptyList()		emptyList(),
	)		)

	assertThat(settings.getInt(Settings.Secure.LOCKSCREEN_SHOW_WALLET)).isEqualTo(0)		assertThat(settings.getInt(Settings.Secure.LOCKSCREEN_SHOW_WALLET)).isEqualTo(0)

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/core/StatusBarOrchestratorTest.kt

+2 −3

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/data/repository/MultiDisplayStatusBarContentInsetsProviderStoreTest.kt

+2 −3

packages/SystemUI/multivalentTests/src/com/android/systemui/user/data/repository/UserRepositoryImplTest.kt

+16 −44

Original line number	Original line	Diff line number	Diff line
	@@ -24,14 +24,15 @@ import android.provider.Settings
	import androidx.test.ext.junit.runners.AndroidJUnit4		import androidx.test.ext.junit.runners.AndroidJUnit4
	import androidx.test.filters.SmallTest		import androidx.test.filters.SmallTest
	import com.android.systemui.SysuiTestCase		import com.android.systemui.SysuiTestCase
	import com.android.systemui.kosmos.unconfinedTestDispatcher		import com.android.systemui.kosmos.testDispatcher
	import com.android.systemui.kosmos.unconfinedTestScope		import com.android.systemui.kosmos.testScope
			import com.android.systemui.kosmos.useUnconfinedTestDispatcher
	import com.android.systemui.settings.FakeUserTracker		import com.android.systemui.settings.FakeUserTracker
	import com.android.systemui.testKosmos		import com.android.systemui.testKosmos
	import com.android.systemui.user.data.model.SelectedUserModel		import com.android.systemui.user.data.model.SelectedUserModel
	import com.android.systemui.user.data.model.SelectionStatus		import com.android.systemui.user.data.model.SelectionStatus
	import com.android.systemui.user.data.model.UserSwitcherSettingsModel		import com.android.systemui.user.data.model.UserSwitcherSettingsModel
	import com.android.systemui.util.settings.unconfinedDispatcherFakeGlobalSettings		import com.android.systemui.util.settings.fakeGlobalSettings
	import com.google.common.truth.Truth.assertThat		import com.google.common.truth.Truth.assertThat
	import kotlinx.coroutines.CoroutineScope		import kotlinx.coroutines.CoroutineScope
	import kotlinx.coroutines.Dispatchers		import kotlinx.coroutines.Dispatchers
	@@ -52,10 +53,10 @@ import org.mockito.MockitoAnnotations
	@RunWith(AndroidJUnit4::class)		@RunWith(AndroidJUnit4::class)
	class UserRepositoryImplTest : SysuiTestCase() {		class UserRepositoryImplTest : SysuiTestCase() {

	private val kosmos = testKosmos()		private val kosmos = testKosmos().useUnconfinedTestDispatcher()
	private val testDispatcher = kosmos.unconfinedTestDispatcher		private val testDispatcher = kosmos.testDispatcher
	private val testScope = kosmos.unconfinedTestScope		private val testScope = kosmos.testScope
	private val globalSettings = kosmos.unconfinedDispatcherFakeGlobalSettings		private val globalSettings = kosmos.fakeGlobalSettings

	@Mock private lateinit var manager: UserManager		@Mock private lateinit var manager: UserManager

	@@ -131,11 +132,7 @@ class UserRepositoryImplTest : SysuiTestCase() {
	whenever(mainUser.identifier).thenReturn(mainUserId)		whenever(mainUser.identifier).thenReturn(mainUserId)

	underTest = create(testScope.backgroundScope)		underTest = create(testScope.backgroundScope)
	val initialExpectedValue =		val initialExpectedValue = setUpUsers(count = 3, selectedIndex = 0)
	setUpUsers(
	count = 3,
	selectedIndex = 0,
	)
	var userInfos: List<UserInfo>? = null		var userInfos: List<UserInfo>? = null
	var selectedUserInfo: UserInfo? = null		var selectedUserInfo: UserInfo? = null
	val job1 = underTest.userInfos.onEach { userInfos = it }.launchIn(this)		val job1 = underTest.userInfos.onEach { userInfos = it }.launchIn(this)
	@@ -146,11 +143,7 @@ class UserRepositoryImplTest : SysuiTestCase() {
	assertThat(selectedUserInfo).isEqualTo(initialExpectedValue[0])		assertThat(selectedUserInfo).isEqualTo(initialExpectedValue[0])
	assertThat(underTest.lastSelectedNonGuestUserId).isEqualTo(selectedUserInfo?.id)		assertThat(underTest.lastSelectedNonGuestUserId).isEqualTo(selectedUserInfo?.id)

	val secondExpectedValue =		val secondExpectedValue = setUpUsers(count = 4, selectedIndex = 1)
	setUpUsers(
	count = 4,
	selectedIndex = 1,
	)
	underTest.refreshUsers()		underTest.refreshUsers()
	assertThat(userInfos).isEqualTo(secondExpectedValue)		assertThat(userInfos).isEqualTo(secondExpectedValue)
	assertThat(selectedUserInfo).isEqualTo(secondExpectedValue[1])		assertThat(selectedUserInfo).isEqualTo(secondExpectedValue[1])
	@@ -158,11 +151,7 @@ class UserRepositoryImplTest : SysuiTestCase() {

	val selectedNonGuestUserId = selectedUserInfo?.id		val selectedNonGuestUserId = selectedUserInfo?.id
	val thirdExpectedValue =		val thirdExpectedValue =
	setUpUsers(		setUpUsers(count = 2, isLastGuestUser = true, selectedIndex = 1)
	count = 2,
	isLastGuestUser = true,
	selectedIndex = 1,
	)
	underTest.refreshUsers()		underTest.refreshUsers()
	assertThat(userInfos).isEqualTo(thirdExpectedValue)		assertThat(userInfos).isEqualTo(thirdExpectedValue)
	assertThat(selectedUserInfo).isEqualTo(thirdExpectedValue[1])		assertThat(selectedUserInfo).isEqualTo(thirdExpectedValue[1])
	@@ -177,12 +166,7 @@ class UserRepositoryImplTest : SysuiTestCase() {
	fun refreshUsers_sortsByCreationTime_guestUserLast() =		fun refreshUsers_sortsByCreationTime_guestUserLast() =
	testScope.runTest {		testScope.runTest {
	underTest = create(testScope.backgroundScope)		underTest = create(testScope.backgroundScope)
	val unsortedUsers =		val unsortedUsers = setUpUsers(count = 3, selectedIndex = 0, isLastGuestUser = true)
	setUpUsers(
	count = 3,
	selectedIndex = 0,
	isLastGuestUser = true,
	)
	unsortedUsers[0].creationTime = 999		unsortedUsers[0].creationTime = 999
	unsortedUsers[1].creationTime = 900		unsortedUsers[1].creationTime = 900
	unsortedUsers[2].creationTime = 950		unsortedUsers[2].creationTime = 950
	@@ -207,10 +191,7 @@ class UserRepositoryImplTest : SysuiTestCase() {
	): List<UserInfo> {		): List<UserInfo> {
	val userInfos =		val userInfos =
	(0 until count).map { index ->		(0 until count).map { index ->
	createUserInfo(		createUserInfo(index, isGuest = isLastGuestUser && index == count - 1)
	index,
	isGuest = isLastGuestUser && index == count - 1,
	)
	}		}
	whenever(manager.aliveUsers).thenReturn(userInfos)		whenever(manager.aliveUsers).thenReturn(userInfos)
	tracker.set(userInfos, selectedIndex)		tracker.set(userInfos, selectedIndex)
	@@ -224,16 +205,10 @@ class UserRepositoryImplTest : SysuiTestCase() {
	var selectedUserInfo: UserInfo? = null		var selectedUserInfo: UserInfo? = null
	val job = underTest.selectedUserInfo.onEach { selectedUserInfo = it }.launchIn(this)		val job = underTest.selectedUserInfo.onEach { selectedUserInfo = it }.launchIn(this)

	setUpUsers(		setUpUsers(count = 2, selectedIndex = 0)
	count = 2,
	selectedIndex = 0,
	)
	tracker.onProfileChanged()		tracker.onProfileChanged()
	assertThat(selectedUserInfo?.id).isEqualTo(0)		assertThat(selectedUserInfo?.id).isEqualTo(0)
	setUpUsers(		setUpUsers(count = 2, selectedIndex = 1)
	count = 2,
	selectedIndex = 1,
	)
	tracker.onProfileChanged()		tracker.onProfileChanged()
	assertThat(selectedUserInfo?.id).isEqualTo(1)		assertThat(selectedUserInfo?.id).isEqualTo(1)
	job.cancel()		job.cancel()
	@@ -287,10 +262,7 @@ class UserRepositoryImplTest : SysuiTestCase() {
	job.cancel()		job.cancel()
	}		}

	private fun createUserInfo(		private fun createUserInfo(id: Int, isGuest: Boolean): UserInfo {
	id: Int,
	isGuest: Boolean,
	): UserInfo {
	val flags = 0		val flags = 0
	return UserInfo(		return UserInfo(
	id,		id,