diff options
author | Tony Mak <tonymak@google.com> | 2016-03-11 23:51:59 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-03-11 23:51:59 +0000 |
commit | 235583df88ac91476d6e2c640f12c8b212a67c4c (patch) | |
tree | 51f9c9d31be11cb703591e41e5b12bfeb4e69f45 /tests | |
parent | 0143b242b072b10a996994f8554f20a3e0dbb3c0 (diff) | |
parent | 769f26fe7488415cb677d4980540bbd7dcfc3ac0 (diff) |
Merge "Query lookup uri with work lookup key directly is not allowed" into nyc-dev am: ebfbfa10d9
am: 769f26fe74
* commit '769f26fe7488415cb677d4980540bbd7dcfc3ac0':
Query lookup uri with work lookup key directly is not allowed
Diffstat (limited to 'tests')
-rw-r--r-- | tests/src/com/android/dialer/calllog/ContactInfoHelperTest.java | 10 |
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(); } |