diff options
author | Dmitri Plotnikov <dplotnikov@google.com> | 2010-10-14 10:10:25 -0700 |
---|---|---|
committer | Dmitri Plotnikov <dplotnikov@google.com> | 2010-10-14 10:10:25 -0700 |
commit | afcfc0005f7c93d46c28cdd8e18f956287ca0d18 (patch) | |
tree | f7a4f31845fc500458e930dec5108b770219f652 /tests | |
parent | 72c7667755dfabba69a2afa479185a3ab458e948 (diff) | |
download | packages_providers_ContactsProvider-afcfc0005f7c93d46c28cdd8e18f956287ca0d18.zip packages_providers_ContactsProvider-afcfc0005f7c93d46c28cdd8e18f956287ca0d18.tar.gz packages_providers_ContactsProvider-afcfc0005f7c93d46c28cdd8e18f956287ca0d18.tar.bz2 |
Fixing ContactAggregator breakage revealed by an automated test
If you have an automatic aggregate of three or more
raw contacts and you confirm the aggregation by adding
an explicit manual override between two of the raw contacts,
the third raw contact falls out of the aggregate.
This CL fixes the problem.
Bug: 3097139
Change-Id: I96b717eeb03e1a49a45b28ee395924f9d61c3e99
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 6667564..328b03c 100644 --- a/tests/src/com/android/providers/contacts/ContactAggregatorTest.java +++ b/tests/src/com/android/providers/contacts/ContactAggregatorTest.java @@ -547,6 +547,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); |