Merge "[Settings] Fix test failure" into main

This commit is contained in:
Zoey Chen
2025-02-24 22:33:45 -08:00
committed by Android (Google) Code Review

View File

@@ -83,9 +83,11 @@ public class LocaleDialogFragmentTest {
LocaleDialogFragment.LocaleDialogController.DialogContent dialogContent = LocaleDialogFragment.LocaleDialogController.DialogContent dialogContent =
controller.getDialogContent(); controller.getDialogContent();
assertEquals(R.string.button_label_confirmation_of_system_locale_change, assertEquals(ResourcesUtils.getResourcesString(
dialogContent.mPositiveButton); mContext, "button_label_confirmation_of_system_locale_change"),
assertEquals(R.string.cancel, dialogContent.mNegativeButton); mContext.getString(dialogContent.mPositiveButton));
assertEquals(ResourcesUtils.getResourcesString(mContext, "cancel"),
mContext.getString(dialogContent.mNegativeButton));
} }
@Test @Test
@@ -98,7 +100,8 @@ public class LocaleDialogFragmentTest {
LocaleDialogFragment.LocaleDialogController.DialogContent dialogContent = LocaleDialogFragment.LocaleDialogController.DialogContent dialogContent =
controller.getDialogContent(); controller.getDialogContent();
assertEquals(R.string.okay, dialogContent.mPositiveButton); assertEquals(ResourcesUtils.getResourcesString(mContext, "okay"),
mContext.getString(dialogContent.mPositiveButton));
assertTrue(dialogContent.mNegativeButton == 0); assertTrue(dialogContent.mNegativeButton == 0);
} }