diff options
| author | Zheng Fu <zhengfu@google.com> | 2015-06-09 16:52:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-09 16:52:35 +0000 |
| commit | 039259f7a3fa9cb11e891c878728b6cc0bc80f25 (patch) | |
| tree | 2ef513b0c5d399ac745fb55f4b5af07798bbe286 /tests | |
| parent | 6c3380a5e5d5ce112f4ea5991b1f7136d51e5ce7 (diff) | |
| parent | a87f9f49c7f773d9ad0926de5017463d72938dab (diff) | |
| download | packages_providers_ContactsProvider-039259f7a3fa9cb11e891c878728b6cc0bc80f25.zip packages_providers_ContactsProvider-039259f7a3fa9cb11e891c878728b6cc0bc80f25.tar.gz packages_providers_ContactsProvider-039259f7a3fa9cb11e891c878728b6cc0bc80f25.tar.bz2 | |
Merge "Roll out new aggregator to limited dogfooders." into mnc-dev
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/com/android/providers/contacts/aggregation/ContactAggregatorTest.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tests/src/com/android/providers/contacts/aggregation/ContactAggregatorTest.java b/tests/src/com/android/providers/contacts/aggregation/ContactAggregatorTest.java index 58a7a6e..3b59cdb 100644 --- a/tests/src/com/android/providers/contacts/aggregation/ContactAggregatorTest.java +++ b/tests/src/com/android/providers/contacts/aggregation/ContactAggregatorTest.java @@ -37,6 +37,7 @@ import android.test.MoreAsserts; import android.test.suitebuilder.annotation.MediumTest; import com.android.providers.contacts.BaseContactsProvider2Test; +import com.android.providers.contacts.ContactsProvider2; import com.android.providers.contacts.TestUtils; import com.android.providers.contacts.tests.R; import com.android.providers.contacts.testutil.DataUtil; @@ -67,6 +68,13 @@ public class ContactAggregatorTest extends BaseContactsProvider2Test { AggregationExceptions.RAW_CONTACT_ID2 }; + protected void setUp() throws Exception { + super.setUp(); + final ContactsProvider2 cp = (ContactsProvider2) getProvider(); + // Make sure to use ContactAggregator.java class + cp.setNewAggregatorForTest(false); + } + public void testCrudAggregationExceptions() throws Exception { long rawContactId1 = RawContactUtil.createRawContactWithName(mResolver, "zz", "top"); long rawContactId2 = RawContactUtil.createRawContactWithName(mResolver, "aa", "bottom"); |