diff options
4 files changed, 35 insertions, 49 deletions
diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/data/repository/ColorCorrectionRepositoryImplTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/data/repository/ColorCorrectionRepositoryImplTest.kt index b6605ed9d007..fa47a02d78c9 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/data/repository/ColorCorrectionRepositoryImplTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/data/repository/ColorCorrectionRepositoryImplTest.kt @@ -59,15 +59,21 @@ class ColorCorrectionRepositoryImplTest : SysuiTestCase() { } @Test + fun isEnabled_settingNotInitialized_returnsFalseByDefault() = + scope.runTest { + val actualValue by collectLastValue(underTest.isEnabled(testUser1)) + + runCurrent() + + Truth.assertThat(actualValue).isFalse() + } + + @Test fun isEnabled_initiallyGetsSettingsValue() = scope.runTest { val actualValue by collectLastValue(underTest.isEnabled(testUser1)) - settings.putIntForUser( - SETTING_NAME, - ENABLED, - testUser1.identifier - ) + settings.putIntForUser(SETTING_NAME, ENABLED, testUser1.identifier) runCurrent() Truth.assertThat(actualValue).isTrue() @@ -78,25 +84,13 @@ class ColorCorrectionRepositoryImplTest : SysuiTestCase() { scope.runTest { val flowValues: List<Boolean> by collectValues(underTest.isEnabled(testUser1)) - settings.putIntForUser( - SETTING_NAME, - DISABLED, - testUser1.identifier - ) + settings.putIntForUser(SETTING_NAME, DISABLED, testUser1.identifier) runCurrent() - settings.putIntForUser( - SETTING_NAME, - ENABLED, - testUser1.identifier - ) + settings.putIntForUser(SETTING_NAME, ENABLED, testUser1.identifier) runCurrent() - settings.putIntForUser( - SETTING_NAME, - DISABLED, - testUser1.identifier - ) + settings.putIntForUser(SETTING_NAME, DISABLED, testUser1.identifier) runCurrent() Truth.assertThat(flowValues.size).isEqualTo(3) @@ -109,26 +103,14 @@ class ColorCorrectionRepositoryImplTest : SysuiTestCase() { val lastValueUser1 by collectLastValue(underTest.isEnabled(testUser1)) val lastValueUser2 by collectLastValue(underTest.isEnabled(testUser2)) - settings.putIntForUser( - SETTING_NAME, - DISABLED, - testUser1.identifier - ) - settings.putIntForUser( - SETTING_NAME, - DISABLED, - testUser2.identifier - ) + settings.putIntForUser(SETTING_NAME, DISABLED, testUser1.identifier) + settings.putIntForUser(SETTING_NAME, DISABLED, testUser2.identifier) runCurrent() Truth.assertThat(lastValueUser1).isFalse() Truth.assertThat(lastValueUser2).isFalse() - settings.putIntForUser( - SETTING_NAME, - ENABLED, - testUser1.identifier - ) + settings.putIntForUser(SETTING_NAME, ENABLED, testUser1.identifier) runCurrent() Truth.assertThat(lastValueUser1).isTrue() @@ -142,11 +124,7 @@ class ColorCorrectionRepositoryImplTest : SysuiTestCase() { runCurrent() Truth.assertThat(success).isTrue() - val actualValue = - settings.getIntForUser( - SETTING_NAME, - testUser1.identifier - ) + val actualValue = settings.getIntForUser(SETTING_NAME, testUser1.identifier) Truth.assertThat(actualValue).isEqualTo(ENABLED) } @@ -157,11 +135,7 @@ class ColorCorrectionRepositoryImplTest : SysuiTestCase() { runCurrent() Truth.assertThat(success).isTrue() - val actualValue = - settings.getIntForUser( - SETTING_NAME, - testUser1.identifier - ) + val actualValue = settings.getIntForUser(SETTING_NAME, testUser1.identifier) Truth.assertThat(actualValue).isEqualTo(DISABLED) } diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/data/repository/ColorInversionRepositoryImplTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/data/repository/ColorInversionRepositoryImplTest.kt index 30eb782e5938..3d8159e70061 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/data/repository/ColorInversionRepositoryImplTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/data/repository/ColorInversionRepositoryImplTest.kt @@ -24,6 +24,7 @@ import com.android.systemui.SysuiTestCase import com.android.systemui.coroutines.collectLastValue import com.android.systemui.coroutines.collectValues import com.android.systemui.util.settings.FakeSettings +import com.google.common.truth.Truth import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.StandardTestDispatcher @@ -59,6 +60,16 @@ class ColorInversionRepositoryImplTest : SysuiTestCase() { } @Test + fun isEnabled_settingNotInitialized_returnsFalseByDefault() = + scope.runTest { + val actualValue by collectLastValue(underTest.isEnabled(testUser1)) + + runCurrent() + + Truth.assertThat(actualValue).isFalse() + } + + @Test fun isEnabled_initiallyGetsSettingsValue() = scope.runTest { val actualValue by collectLastValue(underTest.isEnabled(testUser1)) @@ -72,8 +83,7 @@ class ColorInversionRepositoryImplTest : SysuiTestCase() { @Test fun isEnabled_settingUpdated_valueUpdated() = scope.runTest { - val flowValues: List<Boolean> by - collectValues(underTest.isEnabled(testUser1)) + val flowValues: List<Boolean> by collectValues(underTest.isEnabled(testUser1)) settings.putIntForUser(SETTING_NAME, DISABLED, testUser1.identifier) runCurrent() diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/data/repository/ColorCorrectionRepository.kt b/packages/SystemUI/src/com/android/systemui/accessibility/data/repository/ColorCorrectionRepository.kt index c7e5b645db5f..c23a05128df5 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/data/repository/ColorCorrectionRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/accessibility/data/repository/ColorCorrectionRepository.kt @@ -61,7 +61,8 @@ constructor( .observerFlow(userHandle.identifier, SETTING_NAME) .onStart { emit(Unit) } .map { - secureSettings.getIntForUser(SETTING_NAME, userHandle.identifier) == ENABLED + secureSettings.getIntForUser(SETTING_NAME, DISABLED, userHandle.identifier) == + ENABLED } .distinctUntilChanged() .flowOn(bgCoroutineContext) diff --git a/packages/SystemUI/src/com/android/systemui/accessibility/data/repository/ColorInversionRepository.kt b/packages/SystemUI/src/com/android/systemui/accessibility/data/repository/ColorInversionRepository.kt index 419eada91f87..852579794a27 100644 --- a/packages/SystemUI/src/com/android/systemui/accessibility/data/repository/ColorInversionRepository.kt +++ b/packages/SystemUI/src/com/android/systemui/accessibility/data/repository/ColorInversionRepository.kt @@ -61,7 +61,8 @@ constructor( .observerFlow(userHandle.identifier, SETTING_NAME) .onStart { emit(Unit) } .map { - secureSettings.getIntForUser(SETTING_NAME, userHandle.identifier) == ENABLED + secureSettings.getIntForUser(SETTING_NAME, DISABLED, userHandle.identifier) == + ENABLED } .distinctUntilChanged() .flowOn(bgCoroutineContext) |