ICU-21641 Fix "emoji" and "eor" for Collator::getKeywordValues

See #1743

diff --git a/icu4c/source/common/uresbund.cpp b/icu4c/source/common/uresbund.cpp
index 5ea4187100e02d33d971d55387620e119e7cd7e7..3b8a654c3b60879ddd717cdadac90129d6f73ca4 100644 (file)
--- a/icu4c/source/common/uresbund.cpp
+++ b/icu4c/source/common/uresbund.cpp
@@ -2954,7 +2954,7 @@ ures_getKeywordValues(const char *path, const char *keyword, UErrorCode *status)
         UResourceBundle   *bund = NULL;
         UResourceBundle   *subPtr = NULL;
         UErrorCode subStatus = U_ZERO_ERROR; /* don't fail if a bundle is unopenable */
-        bund = ures_openDirect(path, locale, &subStatus);
+        bund = ures_open(path, locale, &subStatus);
         
 #if defined(URES_TREE_DEBUG)
         if(!bund || U_FAILURE(subStatus)) {

diff --git a/icu4c/source/test/intltest/svccoll.cpp b/icu4c/source/test/intltest/svccoll.cpp
index 8d46c68f37f41f7fa70f204a44b9404e352873e1..a5f22b4d65bfd4f8b6a660cbcfc983ba17ec3716 100644 (file)
--- a/icu4c/source/test/intltest/svccoll.cpp
+++ b/icu4c/source/test/intltest/svccoll.cpp
@@ -560,7 +560,9 @@ static const int32_t KW_COUNT = UPRV_LENGTHOF(KW);
 
 static const char* KWVAL[] = {
     "phonebook",
-    "stroke"
+    "stroke",
+    "emoji",
+    "eor"
 };
 static const int32_t KWVAL_COUNT = UPRV_LENGTHOF(KWVAL);
 

diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationServiceTest.java b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationServiceTest.java
index c30812318eb71b9d85bb1706fba2b9720e971dc6..848499d1c29f7d8b981d536df778f5b69e237c92 100644 (file)
--- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationServiceTest.java
+++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationServiceTest.java
@@ -341,7 +341,9 @@ public class CollationServiceTest extends TestFmwk {
 
     private static final String KWVAL[] = {
         "phonebook",
-        "stroke"
+        "stroke",
+        "emoji",
+        "eor",
     };
 
     @Test