diff options
| author | Andrew Lee <anwlee@google.com> | 2015-06-15 21:52:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-15 21:52:30 +0000 |
| commit | 59a9a14678aaf85feca33570b6f98b5249bdbfde (patch) | |
| tree | f10103365509972de0cbca40dacfa26d1c2b420e /tests | |
| parent | 52814d3e24133add9628b9bf9e5eb33f30af7a83 (diff) | |
| parent | a396ed89f79196443cb4781bf4f2eeea1c5e72fc (diff) | |
am a396ed89: am becbb119: Merge "Fix abundance of "Custom" labels." into mnc-dev
* commit 'a396ed89f79196443cb4781bf4f2eeea1c5e72fc':
Fix abundance of "Custom" labels.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java | 1 | ||||
| -rw-r--r-- | tests/src/com/android/dialer/calllog/CallLogFragmentTest.java | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java b/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java index 9edbbc9b3..2ee38cbe5 100644 --- a/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java +++ b/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java @@ -389,7 +389,6 @@ public class PhoneCallDetailsHelperTest extends AndroidTestCase { details.date = TEST_DATE; details.duration = TEST_DURATION; details.geocode = TEST_GEOCODE; - details.numberLabel = ContactInfo.GEOCODE_AS_LABEL; } private boolean isVoicemail(String number) { diff --git a/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java b/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java index a739b16d2..b3906f814 100644 --- a/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java +++ b/tests/src/com/android/dialer/calllog/CallLogFragmentTest.java @@ -227,8 +227,6 @@ public class CallLogFragmentTest extends ActivityInstrumentationTestCase2<Fragme @MediumTest public void testBindView_WithCachedName() { mCursor.moveToFirst(); - // provide a default custom label instead of an empty string, which corresponds to - // {@value com.android.dialer.calllog.ContactInfo#GEOCODE_AS_LABEL} insertWithCachedValues(TEST_NUMBER, NOW, 0, Calls.INCOMING_TYPE, "John Doe", Phone.TYPE_HOME, TEST_DEFAULT_CUSTOM_LABEL); CallLogListItemViewHolder viewHolder = (CallLogListItemViewHolder) @@ -255,8 +253,6 @@ public class CallLogFragmentTest extends ActivityInstrumentationTestCase2<Fragme @MediumTest public void testBindView_HomeLabel() { mCursor.moveToFirst(); - // provide a default custom label instead of an empty string, which corresponds to - // {@value com.android.dialer.calllog.ContactInfo#GEOCODE_AS_LABEL} insertWithCachedValues(TEST_NUMBER, NOW, 0, Calls.INCOMING_TYPE, "John Doe", Phone.TYPE_HOME, TEST_DEFAULT_CUSTOM_LABEL); CallLogListItemViewHolder viewHolder = (CallLogListItemViewHolder) @@ -270,8 +266,6 @@ public class CallLogFragmentTest extends ActivityInstrumentationTestCase2<Fragme @MediumTest public void testBindView_WorkLabel() { mCursor.moveToFirst(); - // provide a default custom label instead of an empty string, which corresponds to - // {@link com.android.dialer.calllog.ContactInfo#GEOCODE_AS_LABEL} insertWithCachedValues(TEST_NUMBER, NOW, 0, Calls.INCOMING_TYPE, "John Doe", Phone.TYPE_WORK, TEST_DEFAULT_CUSTOM_LABEL); CallLogListItemViewHolder viewHolder = (CallLogListItemViewHolder) |