summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorBrian Attwell <brianattwell@google.com>2015-01-21 17:27:26 -0800
committerBrian Attwell <brianattwell@google.com>2015-01-21 17:56:26 -0800
commita6ef5e923773c8872779c907237d3ecb6545ed7b (patch)
tree336696f4828022e398948dbd63405d8c6208ed14 /tests
parentc7ad9cf70433ea44746208ff56da910346f7e066 (diff)
downloadpackages_providers_ContactsProvider-a6ef5e923773c8872779c907237d3ecb6545ed7b.zip
packages_providers_ContactsProvider-a6ef5e923773c8872779c907237d3ecb6545ed7b.tar.gz
packages_providers_ContactsProvider-a6ef5e923773c8872779c907237d3ecb6545ed7b.tar.bz2
AggregationSuggestions.Builder Part 3/3
Remove unit tests for AggregationSuggestions types that have been deleted. These types were never implemented in the first place. Bug: 18777272 Change-Id: I5c4066d1e933cc4ab18df06809687ee2b7eac91c
Diffstat (limited to 'tests')
-rw-r--r--tests/src/com/android/providers/contacts/aggregation/ContactAggregatorTest.java19
1 files changed, 6 insertions, 13 deletions
diff --git a/tests/src/com/android/providers/contacts/aggregation/ContactAggregatorTest.java b/tests/src/com/android/providers/contacts/aggregation/ContactAggregatorTest.java
index 78f1b80..c4b741a 100644
--- a/tests/src/com/android/providers/contacts/aggregation/ContactAggregatorTest.java
+++ b/tests/src/com/android/providers/contacts/aggregation/ContactAggregatorTest.java
@@ -55,7 +55,8 @@ import java.util.Set;
*
* Run the test like this:
* <code>
- * adb shell am instrument -e class com.android.providers.contacts.ContactAggregatorTest -w \
+ * adb shell am instrument -e \
+ * class com.android.providers.contacts.aggregation.ContactAggregatorTest -w \
* com.android.providers.contacts.tests/android.test.InstrumentationTestRunner
* </code>
*/
@@ -1514,22 +1515,14 @@ public class ContactAggregatorTest extends BaseContactsProvider2Test {
public void testAggregationSuggestionsQueryBuilderWithValues() throws Exception {
Uri uri = AggregationSuggestions.builder()
- .addParameter(AggregationSuggestions.PARAMETER_MATCH_NAME, "name1")
- .addParameter(AggregationSuggestions.PARAMETER_MATCH_NAME, "name2")
- .addParameter(AggregationSuggestions.PARAMETER_MATCH_EMAIL, "email1")
- .addParameter(AggregationSuggestions.PARAMETER_MATCH_EMAIL, "email2")
- .addParameter(AggregationSuggestions.PARAMETER_MATCH_PHONE, "phone1")
- .addParameter(AggregationSuggestions.PARAMETER_MATCH_NICKNAME, "nickname1")
+ .addNameParameter("name1")
+ .addNameParameter("name2")
.setLimit(7)
.build();
assertEquals("content://com.android.contacts/contacts/0/suggestions?"
+ "limit=7"
+ "&query=name%3Aname1"
- + "&query=name%3Aname2"
- + "&query=email%3Aemail1"
- + "&query=email%3Aemail2"
- + "&query=phone%3Aphone1"
- + "&query=nickname%3Anickname1", uri.toString());
+ + "&query=name%3Aname2", uri.toString());
}
public void testAggregatedStatusUpdate() {
@@ -1563,7 +1556,7 @@ public class ContactAggregatorTest extends BaseContactsProvider2Test {
long rawContactId2 = RawContactUtil.createRawContactWithName(mResolver, "first2", "last2");
Uri uri = AggregationSuggestions.builder()
- .addParameter(AggregationSuggestions.PARAMETER_MATCH_NAME, "last1 first1")
+ .addNameParameter("last1 first1")
.build();
Cursor cursor = mResolver.query(