Fixing unit tests

A bunch of tests were broken by the recent change
of the aggregation policy, because they relied
on the old policy.

Some other tests stopped working after we upgraded
to a new version of ICU.

Updating the tests accordingly.

Change-Id: I97a785015834632a896ed4fc6079744962c7a04c

1 files changed, 18 insertions, 9 deletions

diff --git a/tests/src/com/android/providers/contacts/ContactsActor.java b/tests/src/com/android/providers/contacts/ContactsActor.java
index 6e0e47a..bf03d4c 100644
--- a/tests/src/com/android/providers/contacts/ContactsActor.java
+++ b/tests/src/com/android/providers/contacts/ContactsActor.java
@@ -30,6 +30,7 @@ import android.net.Uri;
 import android.os.Binder;
 import android.provider.BaseColumns;
 import android.provider.ContactsContract;
+import android.provider.ContactsContract.AggregationExceptions;
 import android.provider.ContactsContract.CommonDataKinds;
 import android.provider.ContactsContract.Contacts;
 import android.provider.ContactsContract.Data;
@@ -259,27 +260,27 @@ public class ContactsActor {
         }
     }
 
-    public long createContact(boolean isRestricted, String name) {
+    public long createRawContact(boolean isRestricted, String name) {
         ensureCallingPackage();
-        long contactId = createContact(isRestricted);
-        createName(contactId, name);
-        return contactId;
+        long rawContactId = createRawContact(isRestricted);
+        createName(rawContactId, name);
+        return rawContactId;
     }
 
-    public long createContact(boolean isRestricted) {
+    public long createRawContact(boolean isRestricted) {
         ensureCallingPackage();
         final ContentValues values = new ContentValues();
         if (isRestricted) {
             values.put(RawContacts.IS_RESTRICTED, 1);
         }
 
-        Uri contactUri = resolver.insert(RawContacts.CONTENT_URI, values);
-        return ContentUris.parseId(contactUri);
+        Uri rawContactUri = resolver.insert(RawContacts.CONTENT_URI, values);
+        return ContentUris.parseId(rawContactUri);
     }
 
-    public long createContactWithStatus(boolean isRestricted, String name, String address,
+    public long createRawContactWithStatus(boolean isRestricted, String name, String address,
             String status) {
-        final long rawContactId = createContact(isRestricted, name);
+        final long rawContactId = createRawContact(isRestricted, name);
         final long dataId = createEmail(rawContactId, address);
         createStatus(dataId, status);
         return rawContactId;
@@ -409,6 +410,14 @@ public class ContactsActor {
         return ContentUris.parseId(dataUri);
     }
 
+    protected void setAggregationException(int type, long rawContactId1, long rawContactId2) {
+        ContentValues values = new ContentValues();
+        values.put(AggregationExceptions.RAW_CONTACT_ID1, rawContactId1);
+        values.put(AggregationExceptions.RAW_CONTACT_ID2, rawContactId2);
+        values.put(AggregationExceptions.TYPE, type);
+        resolver.update(AggregationExceptions.CONTENT_URI, values, null, null);
+    }
+
     /**
      * Various internal database projections.
      */