diff options
| author | Dmitri Plotnikov <dplotnikov@google.com> | 2010-10-15 16:48:38 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-15 16:48:38 -0700 |
| commit | 75497890701732816c70c4b0d80738ff1837d630 (patch) | |
| tree | e4bdc699730a1655e3c1ff8abca419c379ae2862 /tests | |
| parent | 0ffb2de31ccd89ec56355417adc4c4c7bacd80eb (diff) | |
| parent | afcfc0005f7c93d46c28cdd8e18f956287ca0d18 (diff) | |
| download | packages_providers_ContactsProvider-75497890701732816c70c4b0d80738ff1837d630.zip packages_providers_ContactsProvider-75497890701732816c70c4b0d80738ff1837d630.tar.gz packages_providers_ContactsProvider-75497890701732816c70c4b0d80738ff1837d630.tar.bz2 | |
am afcfc000: Fixing ContactAggregator breakage revealed by an automated test
Merge commit 'afcfc0005f7c93d46c28cdd8e18f956287ca0d18'
* commit 'afcfc0005f7c93d46c28cdd8e18f956287ca0d18':
Fixing ContactAggregator breakage revealed by an automated test
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/com/android/providers/contacts/ContactAggregatorTest.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/src/com/android/providers/contacts/ContactAggregatorTest.java b/tests/src/com/android/providers/contacts/ContactAggregatorTest.java index b05b0f3..551550a 100644 --- a/tests/src/com/android/providers/contacts/ContactAggregatorTest.java +++ b/tests/src/com/android/providers/contacts/ContactAggregatorTest.java @@ -548,6 +548,8 @@ public class ContactAggregatorTest extends BaseContactsProvider2Test { long rawContactId1 = createRawContactWithName("John", "Doe", ACCOUNT_1); long rawContactId2 = createRawContactWithName("John", "Doe", ACCOUNT_2); long rawContactId3 = createRawContactWithName("John", "Doe", ACCOUNT_3); + assertAggregated(rawContactId1, rawContactId2); + assertAggregated(rawContactId1, rawContactId3); setAggregationException( AggregationExceptions.TYPE_KEEP_TOGETHER, rawContactId1, rawContactId2); assertAggregated(rawContactId1, rawContactId2); |