OSDN Git Service

Fixing a broken test
authorDmitri Plotnikov <dplotnikov@google.com>
Wed, 17 Mar 2010 17:43:45 +0000 (10:43 -0700)
committerDmitri Plotnikov <dplotnikov@google.com>
Wed, 17 Mar 2010 17:44:29 +0000 (10:44 -0700)
Change-Id: I09e403a252ca98c7f03718b19c1ca40ad1a13e7a

tests/src/com/android/contacts/EntitySetTests.java

index 26f4184..c9fc3fa 100644 (file)
@@ -480,6 +480,7 @@ public class EntitySetTests extends AndroidTestCase {
         final ContentValues joePhoneInsert = buildPhone(PHONE_BLUE);
         final EntityDelta joeContact = buildAfterEntity(joePhoneInsert);
         final ContentValues joeContactInsert = joeContact.getValues().getCompleteValues();
+        joeContactInsert.put(RawContacts.AGGREGATION_MODE, RawContacts.AGGREGATION_MODE_SUSPENDED);
         first.add(joeContact);
         assertDiffPattern(first,
                 buildAssertVersion(VER_FIRST),
@@ -536,6 +537,7 @@ public class EntitySetTests extends AndroidTestCase {
         final ContentValues phoneInsert = phone.getCompleteValues();
         final ContentValues contactInsert = first.getByRawContactId(CONTACT_MARY).getValues()
                 .getCompleteValues();
+        contactInsert.put(RawContacts.AGGREGATION_MODE, RawContacts.AGGREGATION_MODE_SUSPENDED);
 
         // Merge and verify that update turned into insert
         final EntitySet merged = EntitySet.mergeAfter(second, first);