summaryrefslogtreecommitdiffstats
path: root/tests/src
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-07-29 18:18:17 -0700
committerYorke Lee <yorkelee@google.com>2014-07-29 18:18:17 -0700
commit7f4ce37bd099d8dbad3177a2b9ebe341811a5ce2 (patch)
tree57b7daafb5f56cdd46d8c2db3676575d35077330 /tests/src
parent598aec69d5b7e26dbe18b330ef65f137645c86d9 (diff)
downloadpackages_providers_ContactsProvider-7f4ce37bd099d8dbad3177a2b9ebe341811a5ce2.zip
packages_providers_ContactsProvider-7f4ce37bd099d8dbad3177a2b9ebe341811a5ce2.tar.gz
packages_providers_ContactsProvider-7f4ce37bd099d8dbad3177a2b9ebe341811a5ce2.tar.bz2
Follow ContactsContract API change
Bug: 16403306 Change-Id: I21d25ba836d9d9ab45a7ebdca0e2f24f8c678e43
Diffstat (limited to 'tests/src')
-rw-r--r--tests/src/com/android/providers/contacts/ContactsProvider2Test.java7
-rw-r--r--tests/src/com/android/providers/contacts/FastScrollingIndexCacheTest.java5
2 files changed, 5 insertions, 7 deletions
diff --git a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
index 25e803e..4b07211 100644
--- a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
+++ b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
@@ -44,7 +44,6 @@ import android.provider.ContactsContract.CommonDataKinds.Photo;
import android.provider.ContactsContract.CommonDataKinds.SipAddress;
import android.provider.ContactsContract.CommonDataKinds.StructuredName;
import android.provider.ContactsContract.CommonDataKinds.StructuredPostal;
-import android.provider.ContactsContract.ContactCounts;
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.Data;
import android.provider.ContactsContract.DataUsageFeedback;
@@ -6759,7 +6758,7 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
public void testContactCounts() {
Uri uri = Contacts.CONTENT_URI.buildUpon()
- .appendQueryParameter(ContactCounts.ADDRESS_BOOK_INDEX_EXTRAS, "true").build();
+ .appendQueryParameter(Contacts.ADDRESS_BOOK_INDEX_EXTRAS, "true").build();
RawContactUtil.createRawContact(mResolver);
RawContactUtil.createRawContactWithName(mResolver, "James", "Sullivan");
@@ -6789,13 +6788,13 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
private void assertFirstLetterValues(Cursor cursor, String... expected) {
String[] actual = cursor.getExtras()
- .getStringArray(ContactCounts.EXTRA_ADDRESS_BOOK_INDEX_TITLES);
+ .getStringArray(Contacts.EXTRA_ADDRESS_BOOK_INDEX_TITLES);
MoreAsserts.assertEquals(expected, actual);
}
private void assertFirstLetterCounts(Cursor cursor, int... expected) {
int[] actual = cursor.getExtras()
- .getIntArray(ContactCounts.EXTRA_ADDRESS_BOOK_INDEX_COUNTS);
+ .getIntArray(Contacts.EXTRA_ADDRESS_BOOK_INDEX_COUNTS);
MoreAsserts.assertEquals(expected, actual);
}
diff --git a/tests/src/com/android/providers/contacts/FastScrollingIndexCacheTest.java b/tests/src/com/android/providers/contacts/FastScrollingIndexCacheTest.java
index bda7cc9..4580ce1 100644
--- a/tests/src/com/android/providers/contacts/FastScrollingIndexCacheTest.java
+++ b/tests/src/com/android/providers/contacts/FastScrollingIndexCacheTest.java
@@ -18,7 +18,6 @@ package com.android.providers.contacts;
import android.net.Uri;
import android.os.Bundle;
-import android.provider.ContactsContract.ContactCounts;
import android.provider.ContactsContract.Contacts;
import android.provider.ContactsContract.RawContacts;
import android.test.AndroidTestCase;
@@ -60,9 +59,9 @@ public class FastScrollingIndexCacheTest extends AndroidTestCase {
private void assertBundle(String[] expectedTitles, int[] expectedCounts, Bundle actual) {
assertNotNull(actual);
MoreAsserts.assertEquals(expectedTitles,
- actual.getStringArray(ContactCounts.EXTRA_ADDRESS_BOOK_INDEX_TITLES));
+ actual.getStringArray(Contacts.EXTRA_ADDRESS_BOOK_INDEX_TITLES));
MoreAsserts.assertEquals(expectedCounts,
- actual.getIntArray(ContactCounts.EXTRA_ADDRESS_BOOK_INDEX_COUNTS));
+ actual.getIntArray(Contacts.EXTRA_ADDRESS_BOOK_INDEX_COUNTS));
}
/**