summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHall Liu <hallliu@google.com>2015-11-12 18:41:02 +0000
committerandroid-build-merger <android-build-merger@google.com>2015-11-12 18:41:02 +0000
commit555e623b7a30272612b966422903e84feb2ab7f0 (patch)
treeefabd95f6cc6969605b15c98aac5203c77cfe813
parent3267ed30040e76a0339cd693eed849002e56ca76 (diff)
parentf9c47fc58acc9147962ca853018f3610b95c0824 (diff)
Merge "Fix build breakage due to bad manual cherry-pick" into ub-contactsdialer-b-dev
am: f9c47fc58a * commit 'f9c47fc58acc9147962ca853018f3610b95c0824': Fix build breakage due to bad manual cherry-pick
-rw-r--r--tests/src/com/android/dialer/calllog/CallLogAdapterTest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/src/com/android/dialer/calllog/CallLogAdapterTest.java b/tests/src/com/android/dialer/calllog/CallLogAdapterTest.java
index 13ca0fd76..12ae78538 100644
--- a/tests/src/com/android/dialer/calllog/CallLogAdapterTest.java
+++ b/tests/src/com/android/dialer/calllog/CallLogAdapterTest.java
@@ -266,7 +266,7 @@ public class CallLogAdapterTest extends AndroidTestCase {
}
@MediumTest
- public void testBindView_ContactWithPrefix() {
+ public void testBindView_ContactWithPostDialDigits() {
createCallLogEntry(TEST_NUMBER, TEST_POST_DIAL_DIGITS, NO_VALUE_SET, NO_VALUE_SET);
mAdapter.injectContactInfoForTest(TEST_NUMBER + TEST_POST_DIAL_DIGITS, TEST_COUNTRY_ISO,
createContactInfo());
@@ -274,7 +274,7 @@ public class CallLogAdapterTest extends AndroidTestCase {
mAdapter.changeCursor(mCursor);
mAdapter.onBindViewHolder(mViewHolder, 0);
- assertNameIs(mViewHolder, TEST_CACHED_NAME);
+ assertNameIs(mViewHolder, TEST_CACHED_NAME_PRIMARY);
}
@MediumTest