am 7dd487ec: am bdf60d08: Fix unit test errors.
* commit '7dd487ecec9e596fa09dc6be48e362f4ba39c7a6':
Fix unit test errors.
diff --git a/src/com/android/dialer/PhoneCallDetailsHelper.java b/src/com/android/dialer/PhoneCallDetailsHelper.java
index db37bb3..c820622 100644
--- a/src/com/android/dialer/PhoneCallDetailsHelper.java
+++ b/src/com/android/dialer/PhoneCallDetailsHelper.java
@@ -212,10 +212,12 @@
@NeededForTesting
public void setCallDetailsHeader(TextView nameView, PhoneCallDetails details) {
final CharSequence nameText;
- if (TextUtils.isEmpty(details.name)) {
- nameText = mResources.getString(R.string.recentCalls_addToContact);
- } else {
+ if (!TextUtils.isEmpty(details.name)) {
nameText = details.name;
+ } else if (!TextUtils.isEmpty(details.displayNumber)) {
+ nameText = details.displayNumber;
+ } else {
+ nameText = mResources.getString(R.string.unknown);
}
nameView.setText(nameText);
diff --git a/src/com/android/dialer/calllog/PhoneNumberDisplayUtil.java b/src/com/android/dialer/calllog/PhoneNumberDisplayUtil.java
index e7fcde2..acfd32c 100644
--- a/src/com/android/dialer/calllog/PhoneNumberDisplayUtil.java
+++ b/src/com/android/dialer/calllog/PhoneNumberDisplayUtil.java
@@ -71,14 +71,14 @@
int presentation,
CharSequence formattedNumber,
boolean isVoicemail) {
- if (!TextUtils.isEmpty(formattedNumber)) {
- return formattedNumber;
- }
-
final CharSequence displayName =
getDisplayName(context, accountHandle, number, presentation, isVoicemail);
if (!TextUtils.isEmpty(displayName)) {
return displayName;
+ }
+
+ if (!TextUtils.isEmpty(formattedNumber)) {
+ return formattedNumber;
} else if (!TextUtils.isEmpty(number)) {
return number;
} else {
diff --git a/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java b/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java
index 701a06e..3e7eb66 100644
--- a/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java
+++ b/tests/src/com/android/dialer/PhoneCallDetailsHelperTest.java
@@ -132,11 +132,11 @@
setPhoneCallDetailsWithDate(
new GregorianCalendar(2011, 5, 3, 13, 0, 0).getTimeInMillis());
- assertDateEquals("0 mins ago");
+ assertDateEquals("0 min. ago");
setPhoneCallDetailsWithDate(
new GregorianCalendar(2011, 5, 3, 12, 0, 0).getTimeInMillis());
- assertDateEquals("1 hour ago");
+ assertDateEquals("1 hr. ago");
setPhoneCallDetailsWithDate(
new GregorianCalendar(2011, 5, 2, 13, 0, 0).getTimeInMillis());
@@ -223,7 +223,7 @@
public void testSetCallDetailsHeader_NumberOnly() {
setCallDetailsHeaderWithNumber(TEST_NUMBER, Calls.PRESENTATION_ALLOWED);
assertEquals(View.VISIBLE, mNameView.getVisibility());
- assertEquals("Add to contacts", mNameView.getText().toString());
+ assertEquals("1-412-255-5555", mNameView.getText().toString());
}
public void testSetCallDetailsHeader_UnknownNumber() {
@@ -245,7 +245,7 @@
}
public void testSetCallDetailsHeader_VoicemailNumber() {
- setCallDetailsHeaderWithNumber(TEST_VOICEMAIL_NUMBER, Calls.PRESENTATION_ALLOWED);
+ setCallDetailsHeaderWithVoicemailNumber(TEST_VOICEMAIL_NUMBER, Calls.PRESENTATION_ALLOWED);
assertEquals(View.VISIBLE, mNameView.getVisibility());
assertEquals("Voicemail", mNameView.getText().toString());
}
@@ -412,6 +412,23 @@
false /* isVoicemail */));
}
+ private void setCallDetailsHeaderWithVoicemailNumber(String number, int presentation) {
+ mHelper.setCallDetailsHeader(mNameView,
+ new PhoneCallDetails(
+ mContext,
+ number,
+ presentation,
+ TEST_FORMATTED_NUMBER,
+ TEST_COUNTRY_ISO,
+ TEST_GEOCODE,
+ new int[]{ Calls.INCOMING_TYPE },
+ TEST_DATE,
+ TEST_DURATION,
+ null, 0, null, null,
+ true /* isVoicemail */));
+ }
+
+
private void setCallDetailsHeader(String name) {
mHelper.setCallDetailsHeader(mNameView,
new PhoneCallDetails(