diff options
| author | Jay Shrauner <shrauner@google.com> | 2014-04-08 10:36:56 -0700 |
|---|---|---|
| committer | Jay Shrauner <shrauner@google.com> | 2014-04-08 10:36:56 -0700 |
| commit | acacfa249c3aaf0372cf22afbe408c89720fbb53 (patch) | |
| tree | fa8d27fe043c21e0e1f2db84c59f90523ea611bb /tests/src/com/android/providers/contacts | |
| parent | 03bc605b5c6f17deae7ad8efbd928abdc5d78854 (diff) | |
| download | packages_providers_ContactsProvider-acacfa249c3aaf0372cf22afbe408c89720fbb53.zip packages_providers_ContactsProvider-acacfa249c3aaf0372cf22afbe408c89720fbb53.tar.gz packages_providers_ContactsProvider-acacfa249c3aaf0372cf22afbe408c89720fbb53.tar.bz2 | |
Update German locale tests for ICU 52
ICU 52 removed Sch and St labels for German; update tests.
Bug:13790528
Change-Id: I774a50ed22b9dd535c2c28b99e91500c40c58d64
Diffstat (limited to 'tests/src/com/android/providers/contacts')
| -rw-r--r-- | tests/src/com/android/providers/contacts/ContactLocaleUtilsTest.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tests/src/com/android/providers/contacts/ContactLocaleUtilsTest.java b/tests/src/com/android/providers/contacts/ContactLocaleUtilsTest.java index 1120981..7213941 100644 --- a/tests/src/com/android/providers/contacts/ContactLocaleUtilsTest.java +++ b/tests/src/com/android/providers/contacts/ContactLocaleUtilsTest.java @@ -55,10 +55,6 @@ public class ContactLocaleUtilsTest extends AndroidTestCase { "", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z", "#", ""}; - private static final String[] LABELS_DE = { - "", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", - "N", "O", "P", "Q", "R", "S", "Sch", "St", "T", "U", "V", "W", "X", - "Y", "Z", "#", ""}; private static final String[] LABELS_JA_JP = { "", "\u3042", "\u304B", "\u3055", "\u305F", "\u306A", "\u306F", "\u307E", "\u3084", "\u3089", "\u308F", "\u4ED6", @@ -305,9 +301,11 @@ public class ContactLocaleUtilsTest extends AndroidTestCase { ContactLocaleUtils.setLocale(Locale.GERMANY); assertEquals("S", getLabel("Sacher")); - assertEquals("Sch", getLabel("Schiller")); - assertEquals("St", getLabel("Steiff")); - verifyLabels(getLabels(), LABELS_DE); + + // ICU 51 has labels Sch and St. These were removed in ICU 52 + assertEquals("S", getLabel("Schiller")); + assertEquals("S", getLabel("Steiff")); + verifyLabels(getLabels(), LABELS_EN_US); } private void verifyKeys(final Iterator<String> resultKeys, final String[] expectedKeys) |