summaryrefslogtreecommitdiff
path: root/tests/src
diff options
context:
space:
mode:
authorTony Mak <tonymak@google.com>2016-03-11 21:23:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-03-11 21:23:39 +0000
commitebfbfa10d95ef21373cf7c112eac52413b11c525 (patch)
tree8acc61c55d6e769beb3e9c2dc1237da181f4087e /tests/src
parenta03c1f480e61c1f3507e294095e21b73d23a5e58 (diff)
parent3dc68df0b856eace41aaca6bd0266da023c18835 (diff)
Merge "Query lookup uri with work lookup key directly is not allowed" into nyc-dev
Diffstat (limited to 'tests/src')
-rw-r--r--tests/src/com/android/dialer/calllog/ContactInfoHelperTest.java10
1 files changed, 7 insertions, 3 deletions
diff --git a/tests/src/com/android/dialer/calllog/ContactInfoHelperTest.java b/tests/src/com/android/dialer/calllog/ContactInfoHelperTest.java
index 680afb15f..e53eb7893 100644
--- a/tests/src/com/android/dialer/calllog/ContactInfoHelperTest.java
+++ b/tests/src/com/android/dialer/calllog/ContactInfoHelperTest.java
@@ -22,6 +22,7 @@ import android.provider.ContactsContract.PhoneLookup;
import android.test.AndroidTestCase;
import android.test.suitebuilder.annotation.MediumTest;
+import com.android.contacts.common.ContactsUtils;
import com.android.contacts.common.test.mocks.ContactsMockContext;
import com.android.contacts.common.test.mocks.MockContentProvider.Query;
@@ -99,13 +100,15 @@ public class ContactInfoHelperTest extends AndroidTestCase {
}
public void testLookupDisplayNameAlternative_NullLookup() {
- Assert.assertNull(mContactInfoHelper.lookUpDisplayNameAlternative(mContext, null));
+ Assert.assertNull(mContactInfoHelper.lookUpDisplayNameAlternative(mContext, null,
+ ContactsUtils.USER_TYPE_CURRENT));
}
public void testLookupDisplayNameAlternative_NoResults() {
setUpQueryExpectations(displayNameAlternativeUri,
PhoneQuery.DISPLAY_NAME_ALTERNATIVE_PROJECTION);
- Assert.assertNull(mContactInfoHelper.lookUpDisplayNameAlternative(mContext, TEST_LOOKUP_KEY));
+ Assert.assertNull(mContactInfoHelper.lookUpDisplayNameAlternative(mContext,
+ TEST_LOOKUP_KEY, ContactsUtils.USER_TYPE_CURRENT));
mContext.verify();
}
@@ -113,7 +116,8 @@ public class ContactInfoHelperTest extends AndroidTestCase {
setUpQueryExpectations(displayNameAlternativeUri,
PhoneQuery.DISPLAY_NAME_ALTERNATIVE_PROJECTION, TEST_DISPLAY_NAME_ALTERNATIVE_ROW);
Assert.assertEquals(TEST_DISPLAY_NAME_ALTERNATIVE,
- mContactInfoHelper.lookUpDisplayNameAlternative(mContext, TEST_LOOKUP_KEY));
+ mContactInfoHelper.lookUpDisplayNameAlternative(mContext, TEST_LOOKUP_KEY
+ , ContactsUtils.USER_TYPE_CURRENT));
mContext.verify();
}