Fixing up the tests.
- Recent change b35ab01 changed the prefix highlight colour but didn't
update the test. This fixes the test.
- ContactUtils.areObjectsEqual() method is no longer in use, so was being
removed by Proguard, causing the test to fail. The method may be useful
in the future, annotated it with @NeededForTesting.
- Some setTextWithHighlightingFactory... methods in both
DisplayNameFormatter and ContactListItemView were not being used any
longer, only by the unit tests that tested them. Proguard was therefore
removing them, causing the tests to fail.
Change-Id: I8e52a6d4dc7eac398777897b38cad4ef44d4fa7d
diff --git a/src/com/android/contacts/ContactsUtils.java b/src/com/android/contacts/ContactsUtils.java
index d3d8f34..f1f73ed 100644
--- a/src/com/android/contacts/ContactsUtils.java
+++ b/src/com/android/contacts/ContactsUtils.java
@@ -18,6 +18,7 @@
import com.android.contacts.model.AccountTypeManager;
import com.android.contacts.model.AccountWithDataSet;
+import com.android.contacts.test.NeededForTesting;
import com.android.i18n.phonenumbers.PhoneNumberUtil;
import android.content.Context;
@@ -91,6 +92,7 @@
/**
* Returns true if two objects are considered equal. Two null references are equal here.
*/
+ @NeededForTesting
public static boolean areObjectsEqual(Object a, Object b) {
return a == b || (a != null && a.equals(b));
}