[Issue 2148072] Adding support for non-public legacy API content://contacts/groups/name/*/members

Change-Id: Ia5128b55bb393fde186e95da086c32508374c035

1 files changed, 41 insertions, 14 deletions

diff --git a/tests/src/com/android/providers/contacts/LegacyContactsProviderTest.java b/tests/src/com/android/providers/contacts/LegacyContactsProviderTest.java
index 9e905e59..1ec51f97 100644
--- a/tests/src/com/android/providers/contacts/LegacyContactsProviderTest.java
+++ b/tests/src/com/android/providers/contacts/LegacyContactsProviderTest.java
@@ -632,21 +632,10 @@ public class LegacyContactsProviderTest extends BaseContactsProvider2Test {
 
     public void testGroupMembershipsInsert() {
         ContentValues values = new ContentValues();
-        values.put(Groups.NAME, "Galois");
         values.put(Groups.NOTES, "Abel");
-        Uri groupUri = mResolver.insert(Groups.CONTENT_URI, values);
-
-        values.clear();
-        values.put(People.NAME, "Klein");
-        Uri personUri = mResolver.insert(People.CONTENT_URI, values);
-
-        long groupId = ContentUris.parseId(groupUri);
-        long personId = ContentUris.parseId(personUri);
-
-        values.clear();
-        values.put(GroupMembership.GROUP_ID, groupId);
-        values.put(GroupMembership.PERSON_ID, personId);
-        Uri membershipUri = mResolver.insert(GroupMembership.CONTENT_URI, values);
+        Uri groupUri = insertLegacyGroup("Galois", values);
+        Uri personUri = insertPerson("Klein", values);
+        Uri membershipUri = insertLegacyGroupMembership(groupUri, personUri, values);
         assertStoredValues(membershipUri, values);
         assertSelection(GroupMembership.CONTENT_URI, values, "groupmembership",
                 GroupMembership._ID, ContentUris.parseId(membershipUri));
@@ -674,6 +663,23 @@ public class LegacyContactsProviderTest extends BaseContactsProvider2Test {
         assertStoredValues(personsGroupsUri, values);
     }
 
+    public void testGroupMembersByGroupName() {
+        ContentValues values = new ContentValues();
+        Uri groupUri1 = insertLegacyGroup("Galois", values);
+        Uri personUri1 = insertPerson("Klein", values);
+        insertLegacyGroupMembership(groupUri1, personUri1, values);
+
+        Uri groupUri2 = insertLegacyGroup("Euler", values);
+        Uri personUri2 = insertPerson("Lagrange", values);
+        insertLegacyGroupMembership(groupUri2, personUri2, values);
+
+        // NOTE: testing non-public API support
+        assertStoredValue(Uri.parse("content://contacts/groups/name/Galois/members"),
+                People.NAME, "Klein");
+        assertStoredValue(Uri.parse("content://contacts/groups/name/Euler/members"),
+                People.NAME, "Lagrange");
+    }
+
     public void testPhotoUpdate() throws Exception {
         byte[] photo = loadTestPhoto();
 
@@ -912,6 +918,27 @@ public class LegacyContactsProviderTest extends BaseContactsProvider2Test {
         c.close();
     }
 
+    private Uri insertPerson(String name, ContentValues values) {
+        values.put(People.NAME, name);
+        return mResolver.insert(People.CONTENT_URI, values);
+    }
+
+    private Uri insertLegacyGroup(String name, ContentValues values) {
+        values.put(Groups.NAME, name);
+        return mResolver.insert(Groups.CONTENT_URI, values);
+    }
+
+    private Uri insertLegacyGroupMembership(Uri groupUri, Uri personUri, ContentValues values) {
+        long groupId = ContentUris.parseId(groupUri);
+        long personId = ContentUris.parseId(personUri);
+
+        values.clear();
+        values.put(GroupMembership.GROUP_ID, groupId);
+        values.put(GroupMembership.PERSON_ID, personId);
+        Uri membershipUri = mResolver.insert(GroupMembership.CONTENT_URI, values);
+        return membershipUri;
+    }
+
     private void putContactValues(ContentValues values) {
         putContactValuesExceptName(values);
         values.put(People.NAME, "Deer Dough");