ICU-12185 Fix LDML2ICUConversion of cashDigits/cashRounding

X-SVN-Rev: 38390

diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar
index 84dbd7c189cbcc4ac465c15b4dbf402a2cdc5bb4..fe5766bccc7d87c83919e49b4484df703966d5e2 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:f700d6ddaf706003c86b54aba1157e85324ff214504ce0cf340437fae8223dbd
-size 11754752
+oid sha256:848a445cb828689cd5bca20bfd321db5503ef66c0a94d929fc108a28d0c5595f
+size 11754757

diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar
index 5571182e9439e605212351b48ac2175546e6e5a8..132d2c7fe68675d468e874d6128ecbf243162200 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:3da8204b14225b5765e7cb870ef54e9929fa24110e0d729a653c38298f6bb549
+oid sha256:a75dfbe25f7671a65bb933aed49a71eb9a923767687625982603c54860478ce7
 size 90259

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java
index 0d6fb168edd6fe73f9251216fecd4635cc047906..3827d2c0e0bd466da58300dcb0afb679f92d1ed0 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/NumberFormatTest.java
@@ -4138,7 +4138,7 @@ public class NumberFormatTest extends com.ibm.icu.dev.test.TestFmwk {
         // compare the Currency and Currency Cash Digits
         // Note that as of CLDR 26:
         // * TWD switches from 0 decimals to 2; PKR still has 0, so change test to that
-        // * CAD and all other currencies that rounded to .05 no longer do
+        // * CAD rounds to .05 in the cash style only.
         for (int i = 0; i < 2; i++) {
             String original_expected = "PKR124";
             DecimalFormat custom = null;
@@ -4186,7 +4186,7 @@ public class NumberFormatTest extends com.ibm.icu.dev.test.TestFmwk {
             }
 
             String cash_rounding_currency = fmt.format(123.567);
-            String cash__rounding_currency_expected = "CA$123.57";
+            String cash__rounding_currency_expected = "CA$123.55";
             assertEquals("Test Currency Context", cash__rounding_currency_expected, cash_rounding_currency);
         }