[Issue 1789740] Ensuring that organization is used as a contact display name if name itself is unspecified

2 files changed, 45 insertions, 1 deletions

diff --git a/tests/src/com/android/providers/contacts/BaseContactsProvider2Test.java b/tests/src/com/android/providers/contacts/BaseContactsProvider2Test.java
index 6d1f58e2..fbca3039 100644
--- a/tests/src/com/android/providers/contacts/BaseContactsProvider2Test.java
+++ b/tests/src/com/android/providers/contacts/BaseContactsProvider2Test.java
@@ -38,6 +38,7 @@ import android.provider.ContactsContract.CommonDataKinds.Email;
 import android.provider.ContactsContract.CommonDataKinds.GroupMembership;
 import android.provider.ContactsContract.CommonDataKinds.Im;
 import android.provider.ContactsContract.CommonDataKinds.Nickname;
+import android.provider.ContactsContract.CommonDataKinds.Organization;
 import android.provider.ContactsContract.CommonDataKinds.Phone;
 import android.provider.ContactsContract.CommonDataKinds.Photo;
 import android.provider.ContactsContract.CommonDataKinds.StructuredName;
@@ -184,6 +185,24 @@ public abstract class BaseContactsProvider2Test extends AndroidTestCase {
         return resultUri;
     }
 
+    protected Uri insertOrganization(long rawContactId, String organization) {
+        return insertOrganization(rawContactId, organization, false);
+    }
+
+    protected Uri insertOrganization(long rawContactId, String organization, boolean primary) {
+        ContentValues values = new ContentValues();
+        values.put(Data.RAW_CONTACT_ID, rawContactId);
+        values.put(Data.MIMETYPE, Organization.CONTENT_ITEM_TYPE);
+        values.put(Organization.DATA, organization);
+        values.put(Organization.TYPE, Organization.TYPE_WORK);
+        if (primary) {
+            values.put(Data.IS_PRIMARY, true);
+        }
+
+        Uri resultUri = mResolver.insert(Data.CONTENT_URI, values);
+        return resultUri;
+    }
+
     protected Uri insertPhoneNumber(long rawContactId, String phoneNumber) {
         return insertPhoneNumber(rawContactId, phoneNumber, false);
     }
@@ -548,7 +567,11 @@ public abstract class BaseContactsProvider2Test extends AndroidTestCase {
 
     protected void assertStoredValue(Uri rowUri, String column, Object expectedValue) {
         String value = getStoredValue(rowUri, column);
-        assertEquals("Column value " + column, String.valueOf(expectedValue), value);
+        if (expectedValue == null) {
+            assertNull("Column value " + column, value);
+        } else {
+            assertEquals("Column value " + column, String.valueOf(expectedValue), value);
+        }
     }
 
     protected String getStoredValue(Uri rowUri, String column) {
diff --git a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
index 362bbf80..c1bffab0 100644
--- a/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
+++ b/tests/src/com/android/providers/contacts/ContactsProvider2Test.java
@@ -537,6 +537,27 @@ public class ContactsProvider2Test extends BaseContactsProvider2Test {
         assertAggregated(rawContactId1, rawContactId2, "Potato Head");
     }
 
+    public void testDisplayNameFromData() {
+        long rawContactId = createRawContact();
+        long contactId = queryContactId(rawContactId);
+
+        Uri uri = ContentUris.withAppendedId(Contacts.CONTENT_URI, contactId);
+
+        assertStoredValue(uri, Contacts.DISPLAY_NAME, null);
+        insertEmail(rawContactId, "mike@monstersinc.com");
+        assertStoredValue(uri, Contacts.DISPLAY_NAME, "mike@monstersinc.com");
+
+        insertEmail(rawContactId, "james@monstersinc.com", true);
+        assertStoredValue(uri, Contacts.DISPLAY_NAME, "james@monstersinc.com");
+
+        insertPhoneNumber(rawContactId, "1-800-466-4411");
+        assertStoredValue(uri, Contacts.DISPLAY_NAME, "1-800-466-4411");
+
+        insertOrganization(rawContactId, "Monsters Inc");
+        assertStoredValue(uri, Contacts.DISPLAY_NAME, "Monsters Inc");
+
+    }
+
     public void testSendToVoicemailDefault() {
         long rawContactId = createRawContactWithName();
         long contactId = queryContactId(rawContactId);