Upgrade ICU4J.

[Dictionary.git] / jars / icu4j-52_1 / main / tests / collate / src / com / ibm / icu / dev / test / collator / CollationServiceTest.java

diff --git a/jars/icu4j-4_8_1_1/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationServiceTest.java b/jars/icu4j-52_1/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationServiceTest.java
similarity index 90%
rename from jars/icu4j-4_8_1_1/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationServiceTest.java
rename to jars/icu4j-52_1/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationServiceTest.java
index 5016b5761ca23c887938d34ebcfdd47b4a41eb45..3dd254573a40acf8579c37a0d6b79be7b2a84429 100644 (file)
--- a/jars/icu4j-4_8_1_1/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationServiceTest.java
+++ b/jars/icu4j-52_1/main/tests/collate/src/com/ibm/icu/dev/test/collator/CollationServiceTest.java
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (C) 2003-2010, International Business Machines Corporation and    *
+ * Copyright (C) 2003-2013, International Business Machines Corporation and    *
  * others. All Rights Reserved.                                                *
  *******************************************************************************
  */
@@ -344,7 +344,7 @@ public class CollationServiceTest extends TestFmwk {
                                                          new ULocale("de"),
                                                          isAvailable);
         if (assertTrue("getFunctionalEquivalent(de)!=null", equiv!=null)) {
-            assertEquals("getFunctionalEquivalent(de)", "de", equiv.toString());
+            assertEquals("getFunctionalEquivalent(de)", "root", equiv.toString());
         }
         assertTrue("getFunctionalEquivalent(de).isAvailable==true",
                    isAvailable[0] == true);
@@ -353,7 +353,7 @@ public class CollationServiceTest extends TestFmwk {
                                                  new ULocale("de_DE"),
                                                  isAvailable);
         if (assertTrue("getFunctionalEquivalent(de_DE)!=null", equiv!=null)) {
-            assertEquals("getFunctionalEquivalent(de_DE)", "de", equiv.toString());
+            assertEquals("getFunctionalEquivalent(de_DE)", "root", equiv.toString());
         }
         assertTrue("getFunctionalEquivalent(de_DE).isAvailable==true",
                    isAvailable[0] == true);
@@ -367,22 +367,24 @@ public class CollationServiceTest extends TestFmwk {
     public void TestGetFunctionalEquivalent() {
         String kw[] = Collator.getKeywords();
         final String DATA[] = { 
-                          "de", "de", "t",
-                          "de@collation=direct", "de", "t",
-                          "de@collation=traditional", "de", "t",
-                          "de@collation=gb2312han", "de", "t",
-                          "de@collation=stroke", "de", "t",
-                          "de@collation=pinyin", "de", "t",
-                          "de@collation=phonebook", "de@collation=phonebook", "t",
-                          "de@collation=big5han", "de", "t",
-                          "de_AT", "de", "t",
-                          "de_AT@collation=direct", "de", "t",
-                          "de_AT@collation=traditional", "de", "t",
-                          "de_AT@collation=gb2312han", "de", "t",
-                          "de_AT@collation=stroke", "de", "t",
-                          "de_AT@collation=pinyin", "de", "t",
-                          "de_AT@collation=phonebook", "de@collation=phonebook", "t",
-                          "de_AT@collation=big5han", "de", "t",
+                          "sv", "sv", "t",
+                          "sv@collation=direct", "sv", "t",
+                          "sv@collation=traditional", "sv", "t",
+                          "sv@collation=gb2312han", "sv", "t",
+                          "sv@collation=stroke", "sv", "t",
+                          "sv@collation=pinyin", "sv", "t",
+                          "sv@collation=standard", "sv@collation=standard", "t",
+                          "sv@collation=reformed", "sv", "t",
+                          "sv@collation=big5han", "sv", "t",
+                          "sv_FI", "sv", "t",
+                          "sv_FI@collation=direct", "sv", "t",
+                          "sv_FI@collation=traditional", "sv", "t",
+                          "sv_FI@collation=gb2312han", "sv", "t",
+                          "sv_FI@collation=stroke", "sv", "t",
+                          "sv_FI@collation=pinyin", "sv", "t",
+                          "sv_FI@collation=standard", "sv@collation=standard", "t",
+                          "sv_FI@collation=reformed", "sv", "t",
+                          "sv_FI@collation=big5han", "sv", "t",
                           "nl", "root", "t",
                           "nl@collation=direct", "root", "t",
                           "nl_BE", "root", "t",
@@ -444,22 +446,22 @@ public class CollationServiceTest extends TestFmwk {
     
     public void TestGetKeywordValues(){
         final String[][] PREFERRED = {
-            {"und",             "standard", "ducet", "search"},
-            {"en_US",           "standard", "ducet", "search"},
-            {"en_029",          "standard", "ducet", "search"},
-            {"de_DE",           "standard", "phonebook", "search", "ducet"},
-            {"de_Latn_DE",      "standard", "phonebook", "search", "ducet"},
-            {"zh",              "pinyin", "big5han", "gb2312han", "standard", "stroke", "ducet", "search"},
-            {"zh_Hans",         "pinyin", "big5han", "gb2312han", "standard", "stroke", "ducet", "search"},
-            {"zh_CN",           "pinyin", "big5han", "gb2312han", "standard", "stroke", "ducet", "search"},
-            {"zh_Hant",         "stroke", "big5han", "gb2312han", "pinyin", "standard", "ducet", "search"},
-            {"zh_TW",           "stroke", "big5han", "gb2312han", "pinyin", "standard", "ducet", "search"},
-            {"zh__PINYIN",      "pinyin", "big5han", "gb2312han", "standard", "stroke", "ducet", "search"},
-            {"es_ES",           "standard", "search", "traditional", "ducet"},
-            {"es__TRADITIONAL", "traditional", "search", "standard", "ducet"},
-            {"und@collation=phonebook",     "standard", "ducet", "search"},
-            {"de_DE@collation=big5han",     "standard", "phonebook", "search", "ducet"},
-            {"zzz@collation=xxx",           "standard", "ducet", "search"},
+            {"und",             "standard", "eor", "search"},
+            {"en_US",           "standard", "eor", "search"},
+            {"en_029",          "standard", "eor", "search"},
+            {"de_DE",           "standard", "phonebook", "search", "eor"},
+            {"de_Latn_DE",      "standard", "phonebook", "search", "eor"},
+            {"zh",              "pinyin", "big5han", "gb2312han", "stroke", "zhuyin", "eor", "search", "standard"},
+            {"zh_Hans",         "pinyin", "big5han", "gb2312han", "stroke", "zhuyin", "eor", "search", "standard"},
+            {"zh_CN",           "pinyin", "big5han", "gb2312han", "stroke", "zhuyin", "eor", "search", "standard"},
+            {"zh_Hant",         "stroke", "big5han", "gb2312han", "pinyin", "zhuyin", "eor", "search", "standard"},
+            {"zh_TW",           "stroke", "big5han", "gb2312han", "pinyin", "zhuyin", "eor", "search", "standard"},
+            {"zh__PINYIN",      "pinyin", "big5han", "gb2312han", "stroke", "zhuyin", "eor", "search", "standard"},
+            {"es_ES",           "standard", "search", "traditional", "eor"},
+            {"es__TRADITIONAL", "traditional", "search", "standard", "eor"},
+            {"und@collation=phonebook",     "standard", "eor", "search"},
+            {"de_DE@collation=big5han",     "standard", "phonebook", "search", "eor"},
+            {"zzz@collation=xxx",           "standard", "eor", "search"},
         };
 
         for (int i = 0; i < PREFERRED.length; i++) {