From 8db6c33b465a62e9d8f8a8675c968391c9b74d2c Mon Sep 17 00:00:00 2001 From: Jacky Wang Date: Mon, 10 Mar 2025 10:20:14 +0800 Subject: [PATCH] [Catalyst] Avoid PreferenceMetadata.getPreferenceSummary call PreferenceMetadata.getPreferenceSummary is implementation detail. Bug: 388167106 Flag: EXEMPT refactor Test: atest Change-Id: I4ec429723f0275c540b4e91e46dfc19fd592c524 --- .../settings/accessibility/ColorInversionPreferenceTest.kt | 4 ++-- .../settings/accessibility/DaltonizerPreferenceTest.kt | 4 ++-- .../supervision/SupervisionPinManagementScreenTest.kt | 5 +++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceTest.kt b/tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceTest.kt index 687cd8bef1f..a3966f1ba4c 100644 --- a/tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceTest.kt +++ b/tests/robotests/src/com/android/settings/accessibility/ColorInversionPreferenceTest.kt @@ -97,7 +97,7 @@ class ColorInversionPreferenceTest { fun getSummary_colorInversionOn_verifySummary() { SettingsSecureStore.get(appContext).setInt(SETTING_KEY, AccessibilityUtil.State.ON) - assertThat(colorInversionPreference.getPreferenceSummary(appContext)).isEqualTo( + assertThat(colorInversionPreference.getSummary(appContext)).isEqualTo( appContext.getText( R.string.color_inversion_state_on ) @@ -108,7 +108,7 @@ class ColorInversionPreferenceTest { fun getSummary_colorInversionOff_verifySummary() { SettingsSecureStore.get(appContext).setInt(SETTING_KEY, AccessibilityUtil.State.OFF) - assertThat(colorInversionPreference.getPreferenceSummary(appContext)).isEqualTo( + assertThat(colorInversionPreference.getSummary(appContext)).isEqualTo( appContext.getText( R.string.color_inversion_state_off ) diff --git a/tests/robotests/src/com/android/settings/accessibility/DaltonizerPreferenceTest.kt b/tests/robotests/src/com/android/settings/accessibility/DaltonizerPreferenceTest.kt index f1ccf393371..07d27a0521b 100644 --- a/tests/robotests/src/com/android/settings/accessibility/DaltonizerPreferenceTest.kt +++ b/tests/robotests/src/com/android/settings/accessibility/DaltonizerPreferenceTest.kt @@ -97,7 +97,7 @@ class DaltonizerPreferenceTest { fun getSummary_daltonizerOn_verifySummary() { SettingsSecureStore.get(appContext).setInt(SETTING_KEY, AccessibilityUtil.State.ON) - assertThat(daltonizerPreference.getPreferenceSummary(appContext)).isEqualTo( + assertThat(daltonizerPreference.getSummary(appContext)).isEqualTo( appContext.getText( R.string.daltonizer_state_on ) @@ -108,7 +108,7 @@ class DaltonizerPreferenceTest { fun getSummary_daltonizerOff_verifySummary() { SettingsSecureStore.get(appContext).setInt(SETTING_KEY, AccessibilityUtil.State.OFF) - assertThat(daltonizerPreference.getPreferenceSummary(appContext)).isEqualTo( + assertThat(daltonizerPreference.getSummary(appContext)).isEqualTo( appContext.getText( R.string.daltonizer_state_off ) diff --git a/tests/robotests/src/com/android/settings/supervision/SupervisionPinManagementScreenTest.kt b/tests/robotests/src/com/android/settings/supervision/SupervisionPinManagementScreenTest.kt index ab37b3ca4e9..b39bc5a51e6 100644 --- a/tests/robotests/src/com/android/settings/supervision/SupervisionPinManagementScreenTest.kt +++ b/tests/robotests/src/com/android/settings/supervision/SupervisionPinManagementScreenTest.kt @@ -18,6 +18,7 @@ package com.android.settings.supervision import android.content.Context import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 +import com.android.settings.R import com.google.common.truth.Truth.assertThat import org.junit.Test import org.junit.runner.RunWith @@ -41,7 +42,7 @@ class SupervisionPinManagementScreenTest { @Test fun getSummary_addPin() { - assertThat(supervisionPinManagementScreen.getPreferenceSummary(context)) - .isEqualTo("Add a PIN recovery method") + assertThat(supervisionPinManagementScreen.summary) + .isEqualTo(R.string.supervision_pin_management_preference_summary_add) } }