Fixing broken tests in ContactsProvider2

5 files changed, 27 insertions, 27 deletions

diff --git a/tests/assets/expected_raw_contacts.txt b/tests/assets/expected_raw_contacts.txt
index 65928e5b..f87468b0 100644
--- a/tests/assets/expected_raw_contacts.txt
+++ b/tests/assets/expected_raw_contacts.txt
@@ -5,7 +5,7 @@
 5    deleted=0
 6    dirty=1
 7    sourceid=null
-8    version=2
+8    version=1
 9    sync1=null
 10    sync2=null
 11    sync3=null
@@ -18,7 +18,7 @@
 18    deleted=0
 19    dirty=1
 20    sourceid=3d09f37e0f0dbc6f
-21    version=25
+21    version=1
 22    sync1=1249441106583000
 23    sync2=null
 24    sync3=null
@@ -31,7 +31,7 @@
 31    deleted=0
 32    dirty=1
 33    sourceid=5c9ae978b346ac9
-34    version=12
+34    version=1
 35    sync1=1249441067558000
 36    sync2=null
 37    sync3=null
@@ -44,7 +44,7 @@
 44    deleted=0
 45    dirty=1
 46    sourceid=null
-47    version=4
+47    version=1
 48    sync1=null
 49    sync2=null
 50    sync3=null
diff --git a/tests/src/com/android/providers/contacts/ContactLookupKeyTest.java b/tests/src/com/android/providers/contacts/ContactLookupKeyTest.java
index 52a94cc3..948d74fb 100644
--- a/tests/src/com/android/providers/contacts/ContactLookupKeyTest.java
+++ b/tests/src/com/android/providers/contacts/ContactLookupKeyTest.java
@@ -133,18 +133,24 @@ public class ContactLookupKeyTest extends BaseContactsProvider2Test {
         assertStoredValue(ContentUris.withAppendedId(Contacts.CONTENT_URI, contactId),
                 Contacts.LOOKUP_KEY, lookupKey);
 
-        setAggregationException(AggregationExceptions.TYPE_KEEP_OUT, contactId, rawContactId3);
+        setAggregationException(AggregationExceptions.TYPE_KEEP_SEPARATE, rawContactId1,
+                rawContactId3);
+        setAggregationException(AggregationExceptions.TYPE_KEEP_SEPARATE, rawContactId2,
+                rawContactId3);
         assertAggregated(rawContactId1, rawContactId2);
         assertNotAggregated(rawContactId1, rawContactId3);
+        assertNotAggregated(rawContactId2, rawContactId3);
 
-        assertStoredValue(ContentUris.withAppendedId(Contacts.CONTENT_URI, contactId),
+        long largerContactId = queryContactId(rawContactId1);
+        assertStoredValue(
+                ContentUris.withAppendedId(Contacts.CONTENT_URI, largerContactId),
                 Contacts.LOOKUP_KEY, "0i1.0i2");
         assertStoredValue(
                 ContentUris.withAppendedId(Contacts.CONTENT_URI, queryContactId(rawContactId3)),
                 Contacts.LOOKUP_KEY, "0i3");
 
         Uri lookupUri = Uri.withAppendedPath(Contacts.CONTENT_LOOKUP_URI, lookupKey);
-        assertStoredValue(lookupUri, Contacts._ID, contactId);
+        assertStoredValue(lookupUri, Contacts._ID, largerContactId);
     }
 
     public void testGetLookupUri() {
diff --git a/tests/src/com/android/providers/contacts/ContactsActor.java b/tests/src/com/android/providers/contacts/ContactsActor.java
index af2e85f5..d84f0e10 100644
--- a/tests/src/com/android/providers/contacts/ContactsActor.java
+++ b/tests/src/com/android/providers/contacts/ContactsActor.java
@@ -29,11 +29,11 @@ import android.net.Uri;
 import android.os.Binder;
 import android.provider.BaseColumns;
 import android.provider.ContactsContract;
-import android.provider.Contacts.Phones;
 import android.provider.ContactsContract.CommonDataKinds;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Data;
 import android.provider.ContactsContract.RawContacts;
+import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.test.IsolatedContext;
 import android.test.RenamingDelegatingContext;
 import android.test.mock.MockContentResolver;
@@ -211,7 +211,7 @@ public class ContactsActor {
         values.put(Data.RAW_CONTACT_ID, contactId);
         values.put(Data.IS_PRIMARY, 1);
         values.put(Data.IS_SUPER_PRIMARY, 1);
-        values.put(Data.MIMETYPE, Phones.CONTENT_ITEM_TYPE);
+        values.put(Data.MIMETYPE, Phone.CONTENT_ITEM_TYPE);
         values.put(ContactsContract.CommonDataKinds.Phone.TYPE,
                 ContactsContract.CommonDataKinds.Phone.TYPE_HOME);
         values.put(ContactsContract.CommonDataKinds.Phone.NUMBER, phoneNumber);
diff --git a/tests/src/com/android/providers/contacts/GlobalSearchSupportTest.java b/tests/src/com/android/providers/contacts/GlobalSearchSupportTest.java
index 02b051c8..11406bf0 100644
--- a/tests/src/com/android/providers/contacts/GlobalSearchSupportTest.java
+++ b/tests/src/com/android/providers/contacts/GlobalSearchSupportTest.java
@@ -15,6 +15,7 @@
  */
 package com.android.providers.contacts;
 
+import android.accounts.Account;
 import android.app.SearchManager;
 import android.content.ContentUris;
 import android.content.ContentValues;
@@ -47,7 +48,8 @@ import java.io.IOException;
 @LargeTest
 public class GlobalSearchSupportTest extends BaseContactsProvider2Test {
     public void testSearchSuggestionsNotInVisibleGroup() throws Exception {
-        long rawContactId = createRawContact();
+        Account account = new Account("actname", "acttype");
+        long rawContactId = createRawContact(account);
         insertStructuredName(rawContactId, "Deer", "Dough");
 
         Uri searchUri = new Uri.Builder().scheme("content").authority(ContactsContract.AUTHORITY)
diff --git a/tests/src/com/android/providers/contacts/GroupsTest.java b/tests/src/com/android/providers/contacts/GroupsTest.java
index 9d317693..6e8d7a31 100644
--- a/tests/src/com/android/providers/contacts/GroupsTest.java
+++ b/tests/src/com/android/providers/contacts/GroupsTest.java
@@ -20,10 +20,8 @@ import android.content.ContentUris;
 import android.content.ContentValues;
 import android.database.Cursor;
 import android.net.Uri;
-import android.provider.ContactsContract.Data;
 import android.provider.ContactsContract.Groups;
 import android.provider.ContactsContract.CommonDataKinds.GroupMembership;
-import android.provider.ContactsContract;
 import android.test.suitebuilder.annotation.LargeTest;
 
 /**
@@ -73,13 +71,7 @@ public class GroupsTest extends BaseContactsProvider2Test {
         long contactCharlieDupe = mActor.createContact(false, PERSON_CHARLIE);
         long contactDelta = mActor.createContact(false, PERSON_DELTA);
 
-        // Make sure that Charlie was aggregated
-        {
-            long aggCharlie = mActor.getContactForRawContact(contactCharlie);
-            long aggCharlieDupe = mActor.getContactForRawContact(contactCharlieDupe);
-            assertTrue("Didn't aggregate two contacts with identical names",
-                    (aggCharlie == aggCharlieDupe));
-        }
+        assertAggregated(contactCharlie, contactCharlieDupe);
 
         // Add phone numbers to specific contacts
         mActor.createPhone(contactAlpha, PHONE_ALPHA);
@@ -116,20 +108,20 @@ public class GroupsTest extends BaseContactsProvider2Test {
 
             if (groupId == groupGrey) {
                 // Grey should have four aggregates, three with phones.
-                assertTrue("Incorrect Grey count", (summaryCount == 4));
-                assertTrue("Incorrect Grey with phones count", (summaryWithPhones == 3));
+                assertEquals("Incorrect Grey count", 4, summaryCount);
+                assertEquals("Incorrect Grey with phones count", 3, summaryWithPhones);
             } else if (groupId == groupRed) {
                 // Red should have 3 aggregates, all with phones.
-                assertTrue("Incorrect Red count", (summaryCount == 3));
-                assertTrue("Incorrect Red with phones count", (summaryWithPhones == 3));
+                assertEquals("Incorrect Red count", 3, summaryCount);
+                assertEquals("Incorrect Red with phones count", 3, summaryWithPhones);
             } else if (groupId == groupGreen) {
                 // Green should have 1 aggregate, none with phones.
-                assertTrue("Incorrect Green count", (summaryCount == 1));
-                assertTrue("Incorrect Green with phones count", (summaryWithPhones == 0));
+                assertEquals("Incorrect Green count", 1, summaryCount);
+                assertEquals("Incorrect Green with phones count", 0, summaryWithPhones);
             } else if (groupId == groupBlue) {
                 // Blue should have no contacts.
-                assertTrue("Incorrect Blue count", (summaryCount == 0));
-                assertTrue("Incorrect Blue with phones count", (summaryWithPhones == 0));
+                assertEquals("Incorrect Blue count", 0, summaryCount);
+                assertEquals("Incorrect Blue with phones count", 0, summaryWithPhones);
             } else {
                 fail("Unrecognized group in summary cursor");
             }