ICU-9876 Pre-integrate some CLDR 23 additions/changes, part 2 (J)

X-SVN-Rev: 33075

diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar
index 89b1b91f8774c35f0e1211a395826b336ed7ca90..69593f80abddc58404284c945d9851c0c2d7bed5 100755 (executable)
--- a/icu4j/main/shared/data/icudata.jar
+++ b/icu4j/main/shared/data/icudata.jar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:244d772053d91d4766b521ff4db90379eecab37bda4e2e29fe1d84778491c49e
-size 9825890
+oid sha256:c89514801b0c4cf71ce17df74885897777c8ec71ef0da6b2a1a2bc3be07d4043
+size 9803720

diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar
index 74b078e61829e41241ce767f1b48cd876027f019..42d17a830ef9234c4d519c4746f1567ae3ab535a 100755 (executable)
--- a/icu4j/main/shared/data/icutzdata.jar
+++ b/icu4j/main/shared/data/icutzdata.jar
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2791ddb67faa907874e26c53eab93d013816aed42eaac8f5622a9e5708afd124
+oid sha256:98d7509c014097429ca75e84ee971cde8b39a2549431dedb9df8416e95cc5d5d
 size 97792

diff --git a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/AlphabeticIndexTest.java b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/AlphabeticIndexTest.java
index dc57a67d778d3ca9d1700f59098660ec3be290dd..26290dff0fcfb27fcc25999e1f6325aeca2e9496 100644 (file)
--- a/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/AlphabeticIndexTest.java
+++ b/icu4j/main/tests/collate/src/com/ibm/icu/dev/test/collator/AlphabeticIndexTest.java
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (C) 2008-2012, International Business Machines Corporation and    *
+ * Copyright (C) 2008-2013, International Business Machines Corporation and    *
  * others. All Rights Reserved.                                                *
  *******************************************************************************
  */
@@ -73,7 +73,7 @@ public class AlphabeticIndexTest extends TestFmwk {
             /* Icelandic*/  {"is", "A:\u00C1:B:C:D:\u00D0:E:\u00C9:F:G:H:I:\u00CD:J:K:L:M:N:O:\u00D3:P:Q:R:S:T:U:\u00DA:V:W:X:Y:\u00DD:Z:\u00DE:\u00C6:\u00D6"},
             /* Italian*/    {"it", "A:B:C:D:E:F:G:H:I:J:K:L:M:N:O:P:Q:R:S:T:U:V:W:X:Y:Z"},
             /* Japanese*/   {"ja", "\u3042:\u304B:\u3055:\u305F:\u306A:\u306F:\u307E:\u3084:\u3089:\u308F"},
-            /* Korean*/ {"ko", "\u1100:\u1102:\u1103:\u1105:\u1106:\u1107:\u1109:\u110B:\u110C:\u110E:\u110F:\u1110:\u1111:\u1112"},
+            /* Korean*/ {"ko", "\u3131:\u3134:\u3137:\u3139:\u3141:\u3142:\u3145:\u3147:\u3148:\u314A:\u314B:\u314C:\u314D:\u314E"},
             /* Lithuanian*/ {"lt", "A:B:C:\u010C:D:E:F:G:H:I:J:K:L:M:N:O:P:R:S:\u0160:T:U:V:Z:\u017D"},
             // This should be the correct data.  Commented till it is fixed in CLDR collation data.
             // {"lv", "A:B:C:\u010C:D:E:F:G:\u0122:H:I:Y:J:K:\u0136:L:\u013B:M:N:\u0145:O:P:Q:R:S:\u0160:T:U:V:W:X:Z:\u017D"},

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 a6bc17e26bd61ec893f5917012d097015ff72c5a..628420cffb9d7a6327dd15ab19bf42a9e44a35ab 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
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (C) 2003-2012, International Business Machines Corporation and    *
+ * Copyright (C) 2003-2013, International Business Machines Corporation and    *
  * others. All Rights Reserved.                                                *
  *******************************************************************************
  */
@@ -444,22 +444,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", "zhuyin", "ducet", "search"},
-            {"zh_Hans",         "pinyin", "big5han", "gb2312han", "standard", "stroke", "zhuyin", "ducet", "search"},
-            {"zh_CN",           "pinyin", "big5han", "gb2312han", "standard", "stroke", "zhuyin", "ducet", "search"},
-            {"zh_Hant",         "stroke", "big5han", "gb2312han", "pinyin", "standard", "zhuyin", "ducet", "search"},
-            {"zh_TW",           "stroke", "big5han", "gb2312han", "pinyin", "standard", "zhuyin", "ducet", "search"},
-            {"zh__PINYIN",      "pinyin", "big5han", "gb2312han", "standard", "stroke", "zhuyin", "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", "search"},
+            {"en_US",           "standard", "search"},
+            {"en_029",          "standard", "search"},
+            {"de_DE",           "standard", "phonebook", "search"},
+            {"de_Latn_DE",      "standard", "phonebook", "search"},
+            {"zh",              "pinyin", "big5han", "gb2312han", "standard", "stroke", "zhuyin", "search"},
+            {"zh_Hans",         "pinyin", "big5han", "gb2312han", "standard", "stroke", "zhuyin", "search"},
+            {"zh_CN",           "pinyin", "big5han", "gb2312han", "standard", "stroke", "zhuyin", "search"},
+            {"zh_Hant",         "stroke", "big5han", "gb2312han", "pinyin", "standard", "zhuyin", "search"},
+            {"zh_TW",           "stroke", "big5han", "gb2312han", "pinyin", "standard", "zhuyin", "search"},
+            {"zh__PINYIN",      "pinyin", "big5han", "gb2312han", "standard", "stroke", "zhuyin", "search"},
+            {"es_ES",           "standard", "search", "traditional"},
+            {"es__TRADITIONAL", "traditional", "search", "standard"},
+            {"und@collation=phonebook",     "standard", "search"},
+            {"de_DE@collation=big5han",     "standard", "phonebook", "search"},
+            {"zzz@collation=xxx",           "standard", "search"},
         };
 
         for (int i = 0; i < PREFERRED.length; i++) {

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/CurrencyTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/CurrencyTest.java
index 6583d57ca94579ff44c246a6ecef1438e56aeba0..6bfd090b00e416eb174595811fa48ce5e3253e6c 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/CurrencyTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/util/CurrencyTest.java
@@ -597,7 +597,7 @@ public class CurrencyTest extends TestFmwk {
             {"de_DE",           "EUR"},
             {"de_ZZ",                },
             {"ar",              "EGP"},
-            {"ar_PS",           "JOD", "ILS"},
+            {"ar_PS",           "ILS", "JOD"},
             {"en@currency=CAD",     "USD"},
             {"fr@currency=ZZZ",     "EUR"},
             {"de_DE@currency=DEM",  "EUR"},