[Issue 2147424] Making sure that a contact can be filtered/looked up by any word in the name

Which is not to say that it can be aggregated on any word in the name - that limit is still 4.

Change-Id: I61821af3d8103e3ec58b42df10f96171667c5eca

1 files changed, 16 insertions, 4 deletions

diff --git a/tests/src/com/android/providers/contacts/NameLookupBuilderTest.java b/tests/src/com/android/providers/contacts/NameLookupBuilderTest.java
index b492ab2c..84dc6f36 100644
--- a/tests/src/com/android/providers/contacts/NameLookupBuilderTest.java
+++ b/tests/src/com/android/providers/contacts/NameLookupBuilderTest.java
@@ -182,9 +182,21 @@ public class NameLookupBuilderTest extends TestCase {
     public void testMultiwordName() {
         mBuilder.insertNameLookup(0, 0, "Jo Jeffrey John Jessy Longname");
         String actual = mBuilder.inserted();
-        assertTrue(actual.startsWith(
-                "(0:Jo.Jeffrey.John.Jessy.Longname)" +  // Exact
-                "(2:JoJeffreyJohnJessyLongname)" +      // Full collation key
-                "(1:Longname.Jeffrey.Jessy.John)"));    // Variant: four longest parts
+
+        // Exact name
+        assertTrue(actual.contains("(0:Jo.Jeffrey.John.Jessy.Longname)"));
+
+        // Full collation key
+        assertTrue(actual.contains("(2:JoJeffreyJohnJessyLongname)"));
+
+        // Variant: four longest parts
+        assertTrue(actual.contains("(1:Longname.Jeffrey.Jessy.John)"));
+
+        // All individual words
+        assertTrue(actual.contains("(2:Jo"));
+        assertTrue(actual.contains("(2:Jeffrey"));
+        assertTrue(actual.contains("(2:John"));
+        assertTrue(actual.contains("(2:Jessy"));
+        assertTrue(actual.contains("(2:Longname"));
     }
 }