From fe5e153a123071a72d4128e3fe94a011f343f8b5 Mon Sep 17 00:00:00 2001 From: Zoey Chen Date: Fri, 15 Mar 2024 10:12:40 +0000 Subject: [PATCH] [i18n] Fix tests for RegionalPreference and TickButtonPreference Bug: 329808623 Test: atest TermsOfAddressNotSpecifiedControllerTest Test: atest TermsOfAddressFeminineControllerTest Test: atest TermsOfAddressNeutralControllerTest Test: atest TermsOfAddressMasculineControllerTest Test: atest FirstDayOfWeekItemListControllerTest Test: atest TemperatureUnitListControllerTest Change-Id: I8f00e423799be75a222078247116558f3bb6b34b --- .../TermsOfAddressFeminineControllerTest.java | 11 +++++++---- .../TermsOfAddressMasculineControllerTest.java | 11 +++++++---- .../TermsOfAddressNeutralControllerTest.java | 11 +++++++---- .../TermsOfAddressNotSpecifiedControllerTest.java | 11 +++++++---- .../FirstDayOfWeekItemListControllerTest.java | 3 ++- .../TemperatureUnitListControllerTest.java | 4 +++- 6 files changed, 33 insertions(+), 18 deletions(-) diff --git a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressFeminineControllerTest.java b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressFeminineControllerTest.java index c04e5f92a63..fab25ca5ee5 100644 --- a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressFeminineControllerTest.java +++ b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressFeminineControllerTest.java @@ -22,7 +22,9 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.spy; +import android.app.GrammaticalInflectionManager; import android.content.Context; +import android.content.res.Configuration; import android.os.Looper; import com.android.settings.widget.TickButtonPreference; @@ -58,6 +60,7 @@ public class TermsOfAddressFeminineControllerTest { private TickButtonPreference mMasculinePreference; private TickButtonPreference mNotSpecifiedPreference; private TickButtonPreference mNeutralPreference; + private GrammaticalInflectionManager mGrammaticalInflectionManager; @Before public void setUp() throws Exception { @@ -68,6 +71,8 @@ public class TermsOfAddressFeminineControllerTest { Looper.prepare(); } + mGrammaticalInflectionManager = mContext.getSystemService( + GrammaticalInflectionManager.class); mPreferenceManager = new PreferenceManager(mContext); mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext); mPreferenceCategory = new PreferenceCategory(mContext); @@ -93,12 +98,10 @@ public class TermsOfAddressFeminineControllerTest { public void displayPreference_setGrammaticalGenderIsFeminine_FeminineIsSelected() { TickButtonPreference selectedPreference = (TickButtonPreference) mPreferenceScreen.getPreference(2); - TickButtonPreference pref = (TickButtonPreference) mPreferenceScreen.getPreference(1); - selectedPreference.performClick(); assertThat(selectedPreference.getKey()).isEqualTo(KEY_FEMININE); - assertThat(selectedPreference.isSelected()).isTrue(); - assertThat(pref.isSelected()).isFalse(); + assertThat(mGrammaticalInflectionManager.getSystemGrammaticalGender()).isEqualTo( + Configuration.GRAMMATICAL_GENDER_FEMININE); } } diff --git a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressMasculineControllerTest.java b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressMasculineControllerTest.java index c2298be6faf..e794405526f 100644 --- a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressMasculineControllerTest.java +++ b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressMasculineControllerTest.java @@ -22,7 +22,9 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.spy; +import android.app.GrammaticalInflectionManager; import android.content.Context; +import android.content.res.Configuration; import android.os.Looper; import com.android.settings.widget.TickButtonPreference; @@ -58,6 +60,7 @@ public class TermsOfAddressMasculineControllerTest { private TickButtonPreference mMasculinePreference; private TickButtonPreference mNotSpecifiedPreference; private TickButtonPreference mNeutralPreference; + private GrammaticalInflectionManager mGrammaticalInflectionManager; @Before public void setUp() throws Exception { @@ -68,6 +71,8 @@ public class TermsOfAddressMasculineControllerTest { Looper.prepare(); } + mGrammaticalInflectionManager = mContext.getSystemService( + GrammaticalInflectionManager.class); mPreferenceManager = new PreferenceManager(mContext); mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext); mPreferenceCategory = new PreferenceCategory(mContext); @@ -93,12 +98,10 @@ public class TermsOfAddressMasculineControllerTest { public void displayPreference_setGrammaticalGenderIsMasculine_MasculineIsSelected() { TickButtonPreference selectedPreference = (TickButtonPreference) mPreferenceScreen.getPreference(3); - TickButtonPreference pref = (TickButtonPreference) mPreferenceScreen.getPreference(1); - selectedPreference.performClick(); assertThat(selectedPreference.getKey()).isEqualTo(KEY_MASCULINE); - assertThat(selectedPreference.isSelected()).isTrue(); - assertThat(pref.isSelected()).isFalse(); + assertThat(mGrammaticalInflectionManager.getSystemGrammaticalGender()).isEqualTo( + Configuration.GRAMMATICAL_GENDER_MASCULINE); } } diff --git a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNeutralControllerTest.java b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNeutralControllerTest.java index fb207fc8cfe..ac3824348b4 100644 --- a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNeutralControllerTest.java +++ b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNeutralControllerTest.java @@ -22,7 +22,9 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.spy; +import android.app.GrammaticalInflectionManager; import android.content.Context; +import android.content.res.Configuration; import android.os.Looper; import com.android.settings.widget.TickButtonPreference; @@ -58,6 +60,7 @@ public class TermsOfAddressNeutralControllerTest { private TickButtonPreference mMasculinePreference; private TickButtonPreference mNotSpecifiedPreference; private TickButtonPreference mNeutralPreference; + private GrammaticalInflectionManager mGrammaticalInflectionManager; @Before public void setUp() throws Exception { @@ -68,6 +71,8 @@ public class TermsOfAddressNeutralControllerTest { Looper.prepare(); } + mGrammaticalInflectionManager = mContext.getSystemService( + GrammaticalInflectionManager.class); mPreferenceManager = new PreferenceManager(mContext); mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext); mPreferenceCategory = new PreferenceCategory(mContext); @@ -93,12 +98,10 @@ public class TermsOfAddressNeutralControllerTest { public void displayPreference_setGrammaticalGenderIsNotSpecified_NotSpecifiedIsSelected() { TickButtonPreference selectedPreference = (TickButtonPreference) mPreferenceScreen.getPreference(4); - TickButtonPreference pref = (TickButtonPreference) mPreferenceScreen.getPreference(1); - selectedPreference.performClick(); assertThat(selectedPreference.getKey()).isEqualTo(KEY_NEUTRAL); - assertThat(selectedPreference.isSelected()).isTrue(); - assertThat(pref.isSelected()).isFalse(); + assertThat(mGrammaticalInflectionManager.getSystemGrammaticalGender()).isEqualTo( + Configuration.GRAMMATICAL_GENDER_NEUTRAL); } } diff --git a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNotSpecifiedControllerTest.java b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNotSpecifiedControllerTest.java index 8492c3b37d3..fd7d60d99cc 100644 --- a/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNotSpecifiedControllerTest.java +++ b/tests/unit/src/com/android/settings/localepicker/TermsOfAddressNotSpecifiedControllerTest.java @@ -22,7 +22,9 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.mockito.Mockito.spy; +import android.app.GrammaticalInflectionManager; import android.content.Context; +import android.content.res.Configuration; import android.os.Looper; import com.android.settings.widget.TickButtonPreference; @@ -58,6 +60,7 @@ public class TermsOfAddressNotSpecifiedControllerTest { private TickButtonPreference mMasculinePreference; private TickButtonPreference mNotSpecifiedPreference; private TickButtonPreference mNeutralPreference; + private GrammaticalInflectionManager mGrammaticalInflectionManager; @Before public void setUp() throws Exception { @@ -68,6 +71,8 @@ public class TermsOfAddressNotSpecifiedControllerTest { Looper.prepare(); } + mGrammaticalInflectionManager = mContext.getSystemService( + GrammaticalInflectionManager.class); mPreferenceManager = new PreferenceManager(mContext); mPreferenceScreen = mPreferenceManager.createPreferenceScreen(mContext); mPreferenceCategory = new PreferenceCategory(mContext); @@ -93,12 +98,10 @@ public class TermsOfAddressNotSpecifiedControllerTest { public void displayPreference_setGrammaticalGenderIsNotSpecified_NotSpecifiedIsSelected() { TickButtonPreference selectedPreference = (TickButtonPreference) mPreferenceScreen.getPreference(1); - TickButtonPreference pref = (TickButtonPreference) mPreferenceScreen.getPreference(2); - selectedPreference.performClick(); assertThat(selectedPreference.getKey()).isEqualTo(KEY_NOT_SPECIFIED); - assertThat(selectedPreference.isSelected()).isTrue(); - assertThat(pref.isSelected()).isFalse(); + assertThat(mGrammaticalInflectionManager.getSystemGrammaticalGender()).isEqualTo( + Configuration.GRAMMATICAL_GENDER_NOT_SPECIFIED); } } diff --git a/tests/unit/src/com/android/settings/regionalpreferences/FirstDayOfWeekItemListControllerTest.java b/tests/unit/src/com/android/settings/regionalpreferences/FirstDayOfWeekItemListControllerTest.java index 1dc16c03934..3b72cba75b7 100644 --- a/tests/unit/src/com/android/settings/regionalpreferences/FirstDayOfWeekItemListControllerTest.java +++ b/tests/unit/src/com/android/settings/regionalpreferences/FirstDayOfWeekItemListControllerTest.java @@ -97,7 +97,8 @@ public class FirstDayOfWeekItemListControllerTest { mContext.getContentResolver(), Settings.System.LOCALE_PREFERENCES); assertThat(pref.getKey()).isEqualTo("default"); - assertThat(record).contains("default"); + assertThat( + RegionalPreferencesDataUtils.dayConverter(mContext, record)).contains("default"); } @Test diff --git a/tests/unit/src/com/android/settings/regionalpreferences/TemperatureUnitListControllerTest.java b/tests/unit/src/com/android/settings/regionalpreferences/TemperatureUnitListControllerTest.java index 73bc1937780..0417443aee5 100644 --- a/tests/unit/src/com/android/settings/regionalpreferences/TemperatureUnitListControllerTest.java +++ b/tests/unit/src/com/android/settings/regionalpreferences/TemperatureUnitListControllerTest.java @@ -94,7 +94,9 @@ public class TemperatureUnitListControllerTest { mContext.getContentResolver(), Settings.System.LOCALE_PREFERENCES); assertThat(pref.getKey()).isEqualTo("default"); - assertThat(record).contains("default"); + assertThat( + RegionalPreferencesDataUtils.temperatureUnitsConverter(mContext, record)) + .contains("default"); } @Test