Support searching with given names for Korean names

Change-Id: Ifd5c8ebf265e7d3f4738dc0f378532f612ba9ef6

2 files changed, 44 insertions, 0 deletions

diff --git a/tests/src/com/android/providers/contacts/NameLookupBuilderTest.java b/tests/src/com/android/providers/contacts/NameLookupBuilderTest.java
index 1de34c0..91ab761 100644
--- a/tests/src/com/android/providers/contacts/NameLookupBuilderTest.java
+++ b/tests/src/com/android/providers/contacts/NameLookupBuilderTest.java
@@ -200,6 +200,40 @@ public class NameLookupBuilderTest extends TestCase {
                 "(6:C)", mBuilder.inserted());
     }
 
+    public void testKoreanName() {
+        // Only run this test when Chinese collation is supported.
+        if (!Arrays.asList(Collator.getAvailableLocales()).contains(Locale.KOREA)) {
+            return;
+        }
+
+        // Lee Sang Il
+        mBuilder.insertNameLookup(0, 0, "\uC774\uC0C1\uC77C", FullNameStyle.KOREAN);
+        assertEquals(
+                "(0:\uC774\uC0C1\uC77C)" + // Lee Sang Il
+                "(2:\uC774\uC0C1\uC77C)" + // Lee Sang Il
+                "(6:\uC0C1\uC77C)" + // Sang Il : given name
+                "(7:\u1109\u110B)" + // SIOS IEUNG : consonants of given name
+                "(7:\u110B\u1109\u110B)", // RIEUL SIOS IEUNG : consonants of fullname
+                mBuilder.inserted());
+    }
+
+    public void testKoreanNameWithTwoCharactersFamilyName() {
+        // Only run this test when Chinese collation is supported.
+        if (!Arrays.asList(Collator.getAvailableLocales()).contains(Locale.KOREA)) {
+            return;
+        }
+
+        // Sun Woo Young Nyeu
+        mBuilder.insertNameLookup(0, 0, "\uC120\uC6B0\uC6A9\uB140", FullNameStyle.KOREAN);
+        assertEquals(
+                "(0:\uC120\uC6B0\uC6A9\uB140)" + // Sun Woo Young Nyeu
+                "(2:\uC120\uC6B0\uC6A9\uB140)" + // Sun Woo Young Nyeu
+                "(6:\uC6A9\uB140)" + // Young Nyeu : given name
+                "(7:\u110B\u1102)" + // IEUNG NIEUN : consonants of given name
+                "(7:\u1109\u110B\u110B\u1102)", // SIOS IEUNG IEUNG NIEUN : consonants of fullname
+                mBuilder.inserted());
+    }
+
     public void testMultiwordName() {
         mBuilder.insertNameLookup(0, 0, "Jo Jeffrey John Jessy Longname", FullNameStyle.UNDEFINED);
         String actual = mBuilder.inserted();
diff --git a/tests/src/com/android/providers/contacts/NameSplitterTest.java b/tests/src/com/android/providers/contacts/NameSplitterTest.java
index 87c897e..d656b04 100644
--- a/tests/src/com/android/providers/contacts/NameSplitterTest.java
+++ b/tests/src/com/android/providers/contacts/NameSplitterTest.java
@@ -372,4 +372,14 @@ public class NameSplitterTest extends TestCase {
 
         assertEquals(expectedPhoneticNameStyle, name.phoneticNameStyle);
     }
+
+    public void testSplitKoreanName() {
+        createNameSplitter(Locale.KOREA);
+
+        // Lee - Sang Il
+        assertSplitName("\uC774\uC0C1\uC77C", null, "\uC0C1\uC77C", null, "\uC774", null);
+        // Dok Go - Young Jae
+        assertSplitName("\uB3C5\uACE0\uC601\uC7AC",
+                null, "\uC601\uC7AC", null, "\uB3C5\uACE0", null);
+    }
 }