Merge "Remove static initalizer work for a11y color repos" into main (6647a543) · Commits · e / os / android_frameworks_base

packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/data/repository/ColorCorrectionRepositoryImplTest.kt

+25 −27

Original line number	Original line	Diff line number	Diff line
	@@ -37,11 +37,9 @@ import org.junit.runner.RunWith
	@SmallTest		@SmallTest
	@RunWith(AndroidJUnit4::class)		@RunWith(AndroidJUnit4::class)
	class ColorCorrectionRepositoryImplTest : SysuiTestCase() {		class ColorCorrectionRepositoryImplTest : SysuiTestCase() {
	companion object {
	val TEST_USER_1 = UserHandle.of(1)!!
	val TEST_USER_2 = UserHandle.of(2)!!
	}

			private val testUser1 = UserHandle.of(1)!!
			private val testUser2 = UserHandle.of(2)!!
	private val testDispatcher = StandardTestDispatcher()		private val testDispatcher = StandardTestDispatcher()
	private val scope = TestScope(testDispatcher)		private val scope = TestScope(testDispatcher)
	private val settings: FakeSettings = FakeSettings()		private val settings: FakeSettings = FakeSettings()
	@@ -63,7 +61,7 @@ class ColorCorrectionRepositoryImplTest : SysuiTestCase() {
	settings.putIntForUser(		settings.putIntForUser(
	ColorCorrectionRepositoryImpl.SETTING_NAME,		ColorCorrectionRepositoryImpl.SETTING_NAME,
	1,		1,
	TEST_USER_1.identifier		testUser1.identifier
	)		)

	underTest =		underTest =
	@@ -72,84 +70,84 @@ class ColorCorrectionRepositoryImplTest : SysuiTestCase() {
	settings,		settings,
	)		)

	underTest.isEnabled(TEST_USER_1).launchIn(backgroundScope)		underTest.isEnabled(testUser1).launchIn(backgroundScope)
	runCurrent()		runCurrent()

	val actualValue: Boolean = underTest.isEnabled(TEST_USER_1).first()		val actualValue: Boolean = underTest.isEnabled(testUser1).first()
	Truth.assertThat(actualValue).isTrue()		Truth.assertThat(actualValue).isTrue()
	}		}

	@Test		@Test
	fun isEnabled_settingUpdated_valueUpdated() =		fun isEnabled_settingUpdated_valueUpdated() =
	scope.runTest {		scope.runTest {
	underTest.isEnabled(TEST_USER_1).launchIn(backgroundScope)		underTest.isEnabled(testUser1).launchIn(backgroundScope)

	settings.putIntForUser(		settings.putIntForUser(
	ColorCorrectionRepositoryImpl.SETTING_NAME,		ColorCorrectionRepositoryImpl.SETTING_NAME,
	ColorCorrectionRepositoryImpl.DISABLED,		ColorCorrectionRepositoryImpl.DISABLED,
	TEST_USER_1.identifier		testUser1.identifier
	)		)
	runCurrent()		runCurrent()
	Truth.assertThat(underTest.isEnabled(TEST_USER_1).first()).isFalse()		Truth.assertThat(underTest.isEnabled(testUser1).first()).isFalse()

	settings.putIntForUser(		settings.putIntForUser(
	ColorCorrectionRepositoryImpl.SETTING_NAME,		ColorCorrectionRepositoryImpl.SETTING_NAME,
	ColorCorrectionRepositoryImpl.ENABLED,		ColorCorrectionRepositoryImpl.ENABLED,
	TEST_USER_1.identifier		testUser1.identifier
	)		)
	runCurrent()		runCurrent()
	Truth.assertThat(underTest.isEnabled(TEST_USER_1).first()).isTrue()		Truth.assertThat(underTest.isEnabled(testUser1).first()).isTrue()

	settings.putIntForUser(		settings.putIntForUser(
	ColorCorrectionRepositoryImpl.SETTING_NAME,		ColorCorrectionRepositoryImpl.SETTING_NAME,
	ColorCorrectionRepositoryImpl.DISABLED,		ColorCorrectionRepositoryImpl.DISABLED,
	TEST_USER_1.identifier		testUser1.identifier
	)		)
	runCurrent()		runCurrent()
	Truth.assertThat(underTest.isEnabled(TEST_USER_1).first()).isFalse()		Truth.assertThat(underTest.isEnabled(testUser1).first()).isFalse()
	}		}

	@Test		@Test
	fun isEnabled_settingForUserOneOnly_valueUpdatedForUserOneOnly() =		fun isEnabled_settingForUserOneOnly_valueUpdatedForUserOneOnly() =
	scope.runTest {		scope.runTest {
	underTest.isEnabled(TEST_USER_1).launchIn(backgroundScope)		underTest.isEnabled(testUser1).launchIn(backgroundScope)
	settings.putIntForUser(		settings.putIntForUser(
	ColorCorrectionRepositoryImpl.SETTING_NAME,		ColorCorrectionRepositoryImpl.SETTING_NAME,
	ColorCorrectionRepositoryImpl.DISABLED,		ColorCorrectionRepositoryImpl.DISABLED,
	TEST_USER_1.identifier		testUser1.identifier
	)		)
	underTest.isEnabled(TEST_USER_2).launchIn(backgroundScope)		underTest.isEnabled(testUser2).launchIn(backgroundScope)
	settings.putIntForUser(		settings.putIntForUser(
	ColorCorrectionRepositoryImpl.SETTING_NAME,		ColorCorrectionRepositoryImpl.SETTING_NAME,
	ColorCorrectionRepositoryImpl.DISABLED,		ColorCorrectionRepositoryImpl.DISABLED,
	TEST_USER_2.identifier		testUser2.identifier
	)		)

	runCurrent()		runCurrent()
	Truth.assertThat(underTest.isEnabled(TEST_USER_1).first()).isFalse()		Truth.assertThat(underTest.isEnabled(testUser1).first()).isFalse()
	Truth.assertThat(underTest.isEnabled(TEST_USER_2).first()).isFalse()		Truth.assertThat(underTest.isEnabled(testUser2).first()).isFalse()

	settings.putIntForUser(		settings.putIntForUser(
	ColorCorrectionRepositoryImpl.SETTING_NAME,		ColorCorrectionRepositoryImpl.SETTING_NAME,
	ColorCorrectionRepositoryImpl.ENABLED,		ColorCorrectionRepositoryImpl.ENABLED,
	TEST_USER_1.identifier		testUser1.identifier
	)		)
	runCurrent()		runCurrent()
	Truth.assertThat(underTest.isEnabled(TEST_USER_1).first()).isTrue()		Truth.assertThat(underTest.isEnabled(testUser1).first()).isTrue()
	Truth.assertThat(underTest.isEnabled(TEST_USER_2).first()).isFalse()		Truth.assertThat(underTest.isEnabled(testUser2).first()).isFalse()
	}		}

	@Test		@Test
	fun setEnabled() =		fun setEnabled() =
	scope.runTest {		scope.runTest {
	val success = underTest.setIsEnabled(true, TEST_USER_1)		val success = underTest.setIsEnabled(true, testUser1)
	runCurrent()		runCurrent()
	Truth.assertThat(success).isTrue()		Truth.assertThat(success).isTrue()

	val actualValue =		val actualValue =
	settings.getIntForUser(		settings.getIntForUser(
	ColorCorrectionRepositoryImpl.SETTING_NAME,		ColorCorrectionRepositoryImpl.SETTING_NAME,
	TEST_USER_1.identifier		testUser1.identifier
	)		)
	Truth.assertThat(actualValue).isEqualTo(ColorCorrectionRepositoryImpl.ENABLED)		Truth.assertThat(actualValue).isEqualTo(ColorCorrectionRepositoryImpl.ENABLED)
	}		}
	@@ -157,14 +155,14 @@ class ColorCorrectionRepositoryImplTest : SysuiTestCase() {
	@Test		@Test
	fun setDisabled() =		fun setDisabled() =
	scope.runTest {		scope.runTest {
	val success = underTest.setIsEnabled(false, TEST_USER_1)		val success = underTest.setIsEnabled(false, testUser1)
	runCurrent()		runCurrent()
	Truth.assertThat(success).isTrue()		Truth.assertThat(success).isTrue()

	val actualValue =		val actualValue =
	settings.getIntForUser(		settings.getIntForUser(
	ColorCorrectionRepositoryImpl.SETTING_NAME,		ColorCorrectionRepositoryImpl.SETTING_NAME,
	TEST_USER_1.identifier		testUser1.identifier
	)		)
	Truth.assertThat(actualValue).isEqualTo(ColorCorrectionRepositoryImpl.DISABLED)		Truth.assertThat(actualValue).isEqualTo(ColorCorrectionRepositoryImpl.DISABLED)
	}		}

packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/data/repository/ColorInversionRepositoryImplTest.kt

+25 −25

Original line number	Original line	Diff line number	Diff line
	@@ -39,6 +39,8 @@ import org.junit.runner.RunWith
	@RunWith(AndroidJUnit4::class)		@RunWith(AndroidJUnit4::class)
	class ColorInversionRepositoryImplTest : SysuiTestCase() {		class ColorInversionRepositoryImplTest : SysuiTestCase() {

			private val testUser1 = UserHandle.of(1)!!
			private val testUser2 = UserHandle.of(2)!!
	private val testDispatcher = StandardTestDispatcher()		private val testDispatcher = StandardTestDispatcher()
	private val scope = TestScope(testDispatcher)		private val scope = TestScope(testDispatcher)
	private val settings: FakeSettings = FakeSettings()		private val settings: FakeSettings = FakeSettings()
	@@ -57,7 +59,7 @@ class ColorInversionRepositoryImplTest : SysuiTestCase() {
	@Test		@Test
	fun isEnabled_initiallyGetsSettingsValue() =		fun isEnabled_initiallyGetsSettingsValue() =
	scope.runTest {		scope.runTest {
	settings.putIntForUser(SETTING_NAME, 1, TEST_USER_1.identifier)		settings.putIntForUser(SETTING_NAME, 1, testUser1.identifier)

	underTest =		underTest =
	ColorInversionRepositoryImpl(		ColorInversionRepositoryImpl(
	@@ -65,68 +67,68 @@ class ColorInversionRepositoryImplTest : SysuiTestCase() {
	settings,		settings,
	)		)

	underTest.isEnabled(TEST_USER_1).launchIn(backgroundScope)		underTest.isEnabled(testUser1).launchIn(backgroundScope)
	runCurrent()		runCurrent()

	val actualValue: Boolean = underTest.isEnabled(TEST_USER_1).first()		val actualValue: Boolean = underTest.isEnabled(testUser1).first()
	assertThat(actualValue).isTrue()		assertThat(actualValue).isTrue()
	}		}

	@Test		@Test
	fun isEnabled_settingUpdated_valueUpdated() =		fun isEnabled_settingUpdated_valueUpdated() =
	scope.runTest {		scope.runTest {
	underTest.isEnabled(TEST_USER_1).launchIn(backgroundScope)		underTest.isEnabled(testUser1).launchIn(backgroundScope)

	settings.putIntForUser(SETTING_NAME, DISABLED, TEST_USER_1.identifier)		settings.putIntForUser(SETTING_NAME, DISABLED, testUser1.identifier)
	runCurrent()		runCurrent()
	assertThat(underTest.isEnabled(TEST_USER_1).first()).isFalse()		assertThat(underTest.isEnabled(testUser1).first()).isFalse()

	settings.putIntForUser(SETTING_NAME, ENABLED, TEST_USER_1.identifier)		settings.putIntForUser(SETTING_NAME, ENABLED, testUser1.identifier)
	runCurrent()		runCurrent()
	assertThat(underTest.isEnabled(TEST_USER_1).first()).isTrue()		assertThat(underTest.isEnabled(testUser1).first()).isTrue()

	settings.putIntForUser(SETTING_NAME, DISABLED, TEST_USER_1.identifier)		settings.putIntForUser(SETTING_NAME, DISABLED, testUser1.identifier)
	runCurrent()		runCurrent()
	assertThat(underTest.isEnabled(TEST_USER_1).first()).isFalse()		assertThat(underTest.isEnabled(testUser1).first()).isFalse()
	}		}

	@Test		@Test
	fun isEnabled_settingForUserOneOnly_valueUpdatedForUserOneOnly() =		fun isEnabled_settingForUserOneOnly_valueUpdatedForUserOneOnly() =
	scope.runTest {		scope.runTest {
	underTest.isEnabled(TEST_USER_1).launchIn(backgroundScope)		underTest.isEnabled(testUser1).launchIn(backgroundScope)
	settings.putIntForUser(SETTING_NAME, DISABLED, TEST_USER_1.identifier)		settings.putIntForUser(SETTING_NAME, DISABLED, testUser1.identifier)
	underTest.isEnabled(TEST_USER_2).launchIn(backgroundScope)		underTest.isEnabled(testUser2).launchIn(backgroundScope)
	settings.putIntForUser(SETTING_NAME, DISABLED, TEST_USER_2.identifier)		settings.putIntForUser(SETTING_NAME, DISABLED, testUser2.identifier)

	runCurrent()		runCurrent()
	assertThat(underTest.isEnabled(TEST_USER_1).first()).isFalse()		assertThat(underTest.isEnabled(testUser1).first()).isFalse()
	assertThat(underTest.isEnabled(TEST_USER_2).first()).isFalse()		assertThat(underTest.isEnabled(testUser2).first()).isFalse()

	settings.putIntForUser(SETTING_NAME, ENABLED, TEST_USER_1.identifier)		settings.putIntForUser(SETTING_NAME, ENABLED, testUser1.identifier)
	runCurrent()		runCurrent()
	assertThat(underTest.isEnabled(TEST_USER_1).first()).isTrue()		assertThat(underTest.isEnabled(testUser1).first()).isTrue()
	assertThat(underTest.isEnabled(TEST_USER_2).first()).isFalse()		assertThat(underTest.isEnabled(testUser2).first()).isFalse()
	}		}

	@Test		@Test
	fun setEnabled() =		fun setEnabled() =
	scope.runTest {		scope.runTest {
	val success = underTest.setIsEnabled(true, TEST_USER_1)		val success = underTest.setIsEnabled(true, testUser1)
	runCurrent()		runCurrent()
	assertThat(success).isTrue()		assertThat(success).isTrue()

	val actualValue = settings.getIntForUser(SETTING_NAME, TEST_USER_1.identifier)		val actualValue = settings.getIntForUser(SETTING_NAME, testUser1.identifier)
	assertThat(actualValue).isEqualTo(ENABLED)		assertThat(actualValue).isEqualTo(ENABLED)
	}		}

	@Test		@Test
	fun setDisabled() =		fun setDisabled() =
	scope.runTest {		scope.runTest {
	val success = underTest.setIsEnabled(false, TEST_USER_1)		val success = underTest.setIsEnabled(false, testUser1)
	runCurrent()		runCurrent()
	assertThat(success).isTrue()		assertThat(success).isTrue()

	val actualValue = settings.getIntForUser(SETTING_NAME, TEST_USER_1.identifier)		val actualValue = settings.getIntForUser(SETTING_NAME, testUser1.identifier)
	assertThat(actualValue).isEqualTo(DISABLED)		assertThat(actualValue).isEqualTo(DISABLED)
	}		}

	@@ -134,7 +136,5 @@ class ColorInversionRepositoryImplTest : SysuiTestCase() {
	private const val SETTING_NAME = ACCESSIBILITY_DISPLAY_INVERSION_ENABLED		private const val SETTING_NAME = ACCESSIBILITY_DISPLAY_INVERSION_ENABLED
	private const val DISABLED = 0		private const val DISABLED = 0
	private const val ENABLED = 1		private const val ENABLED = 1
	private val TEST_USER_1 = UserHandle.of(1)!!
	private val TEST_USER_2 = UserHandle.of(2)!!
	}		}
	}		}