From 30268f9198a8b25aa0c9d90c0c2390f7a4bffb0d Mon Sep 17 00:00:00 2001 From: Jay Shrauner Date: Tue, 15 Apr 2014 15:15:01 -0700 Subject: Remove German address book test Remove German address book label/count test that was added with ICU 51 to check for Sch and St labels. Those labels were removed with ICU 52. Bug:13790528 Change-Id: I238f51b86299db6353ec256508aca2bda46ca8f0 --- .../providers/contacts/ContactsProvider2Test.java | 26 ---------------------- 1 file changed, 26 deletions(-) (limited to 'tests/src/com/android/providers/contacts') diff --git a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java index d0b02fc..6a10c87 100644 --- a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java +++ b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java @@ -6783,32 +6783,6 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test { cursor.close(); } - public void testContactCountsWithGermanNames() { - if (!hasGermanCollator()) { - return; - } - ContactLocaleUtils.setLocale(Locale.GERMANY); - - Uri uri = Contacts.CONTENT_URI.buildUpon() - .appendQueryParameter(ContactCounts.ADDRESS_BOOK_INDEX_EXTRAS, "true").build(); - - RawContactUtil.createRawContactWithName(mResolver, "Josef", "Sacher"); - RawContactUtil.createRawContactWithName(mResolver, "Franz", "Schiller"); - RawContactUtil.createRawContactWithName(mResolver, "Eckart", "Steiff"); - RawContactUtil.createRawContactWithName(mResolver, "Klaus", "Seiler"); - RawContactUtil.createRawContactWithName(mResolver, "Lars", "Sultan"); - RawContactUtil.createRawContactWithName(mResolver, "Heidi", "Rilke"); - RawContactUtil.createRawContactWithName(mResolver, "Suse", "Thomas"); - - Cursor cursor = mResolver.query(uri, - new String[]{Contacts.DISPLAY_NAME}, - null, null, Contacts.SORT_KEY_ALTERNATIVE); - - assertFirstLetterValues(cursor, "R", "S", "Sch", "St", "T"); - assertFirstLetterCounts(cursor, 1, 3, 1, 1, 1); - cursor.close(); - } - private void assertFirstLetterValues(Cursor cursor, String... expected) { String[] actual = cursor.getExtras() .getStringArray(ContactCounts.EXTRA_ADDRESS_BOOK_INDEX_TITLES); -- cgit v1.1