Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f620eb0 authored by Bryce Lee's avatar Bryce Lee Committed by Android (Google) Code Review
Browse files

Merge "Correct test logic around SecureSettings#putStringForUser/putIntForUser" into main

parents 1b9cbdb8 e8e994b2

packages/SystemUI/multivalentTests/src/com/android/systemui/accessibility/fontscaling/FontScalingDialogDelegateTest.kt

+7 −7
Original line number Diff line number Diff line
@@ -83,10 +83,11 @@ class FontScalingDialogDelegateTest : SysuiTestCase() { 
        MockitoAnnotations.initMocks(this)

        testableLooper = TestableLooper.get(this)

        val mainHandler = Handler(testableLooper.looper)

        systemSettings = FakeSettings()

        val fakeSettings = FakeSettings()

        systemSettings = fakeSettings

        // Guarantee that the systemSettings always starts with the default font scale.

        systemSettings.putFloatForUser(Settings.System.FONT_SCALE, 1.0f, userTracker.userId)

        secureSettings = FakeSettings()

        secureSettings = fakeSettings

        systemClock = FakeSystemClock()

        backgroundDelayableExecutor = FakeExecutor(systemClock)

        whenever(sysuiState.setFlag(anyLong(), anyBoolean())).thenReturn(sysuiState)
@@ -207,9 +208,9 @@ class FontScalingDialogDelegateTest : SysuiTestCase() { 
        dialog.show()



        val iconStartFrame: ViewGroup = dialog.findViewById(R.id.icon_start_frame)!!

        secureSettings.putIntForUser(

        secureSettings.putStringForUser(

            Settings.Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED,

            OFF,

            OFF.toString(),

            userTracker.userId,

        )
@@ -220,12 +221,11 @@ class FontScalingDialogDelegateTest : SysuiTestCase() { 
        backgroundDelayableExecutor.runAllReady()



        val currentSettings =

            secureSettings.getIntForUser(

            secureSettings.getStringForUser(

                Settings.Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED,

                /* def = */ OFF,

                userTracker.userId,

            )

        assertThat(currentSettings).isEqualTo(ON)

        assertThat(currentSettings).isEqualTo(ON.toString())



        dialog.dismiss()

    }

packages/SystemUI/multivalentTests/src/com/android/systemui/keyboard/stickykeys/ui/viewmodel/StickyKeysIndicatorViewModelTest.kt

+2 −2
Original line number Diff line number Diff line
@@ -116,9 +116,9 @@ class StickyKeysIndicatorViewModelTest : SysuiTestCase() { 
    }



    private fun setStickyKeySetting(enabled: Boolean) {

        val newValue = if (enabled) "1" else "0"

        val newValue = if (enabled) 1 else 0

        val defaultUser = userRepository.getSelectedUserInfo().id

        secureSettings.putStringForUser(ACCESSIBILITY_STICKY_KEYS, newValue, defaultUser)

        secureSettings.putIntForUser(ACCESSIBILITY_STICKY_KEYS, newValue, defaultUser)

    }



    @Test