Fix contacts provider cts tests
Bug:22927094
Change-Id: I19b16fdfc4ae04c27433aae38a7071a8611f2138
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_DataTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_DataTest.java
index c695630..33d3a28 100644
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_DataTest.java
+++ b/tests/tests/provider/src/android/provider/cts/ContactsContract_DataTest.java
@@ -22,7 +22,6 @@
import android.content.ContentProviderClient;
import android.content.ContentResolver;
import android.content.ContentValues;
-import android.database.Cursor;
import android.net.Uri;
import android.os.SystemClock;
import android.provider.ContactsContract;
@@ -402,7 +401,7 @@
Data.STATUS_ICON,
Data.TIMES_USED,
Data.LAST_TIME_USED},
- new long[]{rawContact.getId()}
+ new long[]{contactId}
);
}
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsContract_PinnedPositionsTest.java b/tests/tests/provider/src/android/provider/cts/ContactsContract_PinnedPositionsTest.java
index 2558c36..e56127b 100644
--- a/tests/tests/provider/src/android/provider/cts/ContactsContract_PinnedPositionsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/ContactsContract_PinnedPositionsTest.java
@@ -203,9 +203,9 @@
ContactUtil.setAggregationException(mResolver, AggregationExceptions.TYPE_KEEP_SEPARATE,
i1.mRawContactId, i4.mRawContactId);
- // Raw contacts should be unpinned after being split, but still starred.
+ // Raw contacts should keep the pinned position after re-grouping, and still starred.
assertValuesForRawContact(i1.mRawContactId,
- newContentValues(RawContacts.PINNED, PinnedPositions.UNPINNED, RawContacts.STARRED,
+ newContentValues(RawContacts.PINNED, 1, RawContacts.STARRED,
1));
assertValuesForRawContact(i2.mRawContactId,
newContentValues(RawContacts.PINNED, 2, RawContacts.STARRED, 1));
@@ -229,7 +229,7 @@
final long cId1 = RawContactUtil.queryContactIdByRawContactId(mResolver, i1.mRawContactId);
final long cId4 = RawContactUtil.queryContactIdByRawContactId(mResolver, i4.mRawContactId);
- assertValuesForContact(cId1, newContentValues(Contacts.PINNED, PinnedPositions.UNPINNED));
+ assertValuesForContact(cId1, newContentValues(Contacts.PINNED, 1));
assertValuesForContact(i2.mContactId, newContentValues(Contacts.PINNED, 2));
assertValuesForContact(cId4, newContentValues(Contacts.PINNED, PinnedPositions.UNPINNED));
assertValuesForContact(i5.mContactId,
@@ -241,7 +241,7 @@
i5.mRawContactId, i6.mRawContactId);
// The resulting contact should have a pinned value of 6.
- assertValuesForContact(cId1, newContentValues(Contacts.PINNED, PinnedPositions.UNPINNED));
+ assertValuesForContact(cId1, newContentValues(Contacts.PINNED, 1));
assertValuesForContact(i2.mContactId, newContentValues(Contacts.PINNED, 2));
assertValuesForContact(cId4, newContentValues(Contacts.PINNED, PinnedPositions.UNPINNED));
assertValuesForContact(i5.mContactId, newContentValues(Contacts.PINNED, 6));
diff --git a/tests/tests/provider/src/android/provider/cts/ContactsTest.java b/tests/tests/provider/src/android/provider/cts/ContactsTest.java
index 9febaa2..4d1cb86 100644
--- a/tests/tests/provider/src/android/provider/cts/ContactsTest.java
+++ b/tests/tests/provider/src/android/provider/cts/ContactsTest.java
@@ -40,6 +40,7 @@
import android.provider.Contacts.Phones;
import android.provider.Contacts.Photos;
import android.provider.Contacts.Settings;
+import android.provider.ContactsContract;
import android.telephony.PhoneNumberUtils;
import android.test.InstrumentationTestCase;
@@ -56,7 +57,7 @@
protected void setUp() throws Exception {
super.setUp();
mContentResolver = getInstrumentation().getTargetContext().getContentResolver();
- mProvider = mContentResolver.acquireContentProviderClient(Contacts.AUTHORITY);
+ mProvider = mContentResolver.acquireContentProviderClient(ContactsContract.AUTHORITY);
mCallLogProvider = mContentResolver.acquireContentProviderClient(CallLog.AUTHORITY);
}
