diff options
| author | Andrew Lee <anwlee@google.com> | 2015-06-15 21:30:30 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-15 21:30:31 +0000 |
| commit | becbb119bdcd96257106b990ce84bac99388deac (patch) | |
| tree | 8061827cb884937422a83c0380058d5c26ff8164 /tests | |
| parent | 7eb56cec2df622a012f1f164934d67cb555bbc7c (diff) | |
| parent | e224017d69630c3b3aea2667e26ab91bb9ecc0be (diff) | |
| download | android_packages_apps_Dialer-becbb119bdcd96257106b990ce84bac99388deac.tar.gz android_packages_apps_Dialer-becbb119bdcd96257106b990ce84bac99388deac.tar.bz2 android_packages_apps_Dialer-becbb119bdcd96257106b990ce84bac99388deac.zip | |
Merge "Fix abundance of "Custom" labels." into mnc-dev
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) |