Sanity check against contact-id = 0

Test: adb shell am instrument -w com.android.providers.contacts.tests

Bug 35756516

Change-Id: I3627fab41781b9d547f69320ff2519708d81135b

1 files changed, 15 insertions, 5 deletions

diff --git a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
index 930a8fa8..e407a794 100644
--- a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
+++ b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
@@ -8999,12 +8999,22 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
 
         String[] projection = new String[]{ContactsContract.RawContacts.DIRTY,
                 ContactsContract.RawContacts.DELETED};
-        List<String[]> records = RawContactUtil.queryByContactId(mResolver, ids.mContactId,
+        String[] record = RawContactUtil.queryByRawContactId(mResolver, ids.mRawContactId,
                 projection);
-        for (String[] arr : records) {
-            assertEquals("1", arr[0]);
-            assertEquals("1", arr[1]);
-        }
+        assertEquals("1", record[0]);
+        assertEquals("1", record[1]);
+
+        // Clean up
+        RawContactUtil.delete(mResolver, ids.mRawContactId, true);
+    }
+
+    public void testContactDelete_checkRawContactContactId() {
+        DatabaseAsserts.ContactIdPair ids = assertContactCreateDelete();
+
+        String[] projection = new String[]{ContactsContract.RawContacts.CONTACT_ID};
+        String[] record = RawContactUtil.queryByRawContactId(mResolver, ids.mRawContactId,
+                projection);
+        assertNull(record[0]);
 
         // Clean up
         RawContactUtil.delete(mResolver, ids.mRawContactId, true);