commit ec220ec3e822cad4e86dbd8817850ca785217299
author Chih-Chung Chang <chihchung@google.com> Wed Mar 17 10:58:47 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 17 10:58:47 2010 -0700
tree f87eab898beecc243766bb04837def2295973374
parent c7c1905d60786936527e4baa0c131d435d8bbdb5
parent 22faa2a80b1fdd353052d807cf3056b5eab9b2b4

Merge "Save contacts photo in the same directory as Camera."

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

diff --git a/tests/src/com/android/contacts/EntitySetTests.java b/tests/src/com/android/contacts/EntitySetTests.java
index 26f4184..c9fc3fa 100644
--- a/tests/src/com/android/contacts/EntitySetTests.java
+++ b/tests/src/com/android/contacts/EntitySetTests.java
@@ -480,6 +480,7 @@
         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 @@
         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);