diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index fd0889cce53..25a7180d2ed 100755 --- 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:b882f018fe19d1d295817d91b5a99f1eb7a01d08e538adf83a6253e981ce95f5 -size 11732712 +oid sha256:049d2957a634b35ba8a909379b6fcd990f15c7cc4750934f17030b437f69613b +size 11770699 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index e4c6cbd3cac..0dd8f1a7862 100755 --- 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:655595cc446eaa3a49429da0d4963e9f6f94ad1d98512063ea0cdf913c35d12f +oid sha256:121c44d13ccc2af834b27b19e539d37e4e396da009799f373912c4f630d4a810 size 91644 diff --git a/icu4j/main/shared/data/testdata.jar b/icu4j/main/shared/data/testdata.jar index 2fc08106ca7..d89e292e678 100755 --- a/icu4j/main/shared/data/testdata.jar +++ b/icu4j/main/shared/data/testdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eec13ca8824524c72ee5d3f18ed9b2964ffde0c07c4238ae305ccc7ebc5fd784 -size 811414 +oid sha256:cd9313c59d996fd80ccf3085baa5a17b8ecf2a4a962afc1ab4cf1c6528287f93 +size 811718 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/numberformattestspecification.txt b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/numberformattestspecification.txt index 024047a9859..930b04ed34e 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/data/numberformattestspecification.txt +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/data/numberformattestspecification.txt @@ -1,3 +1,5 @@ +// Copyright (C) 2016 and later: Unicode, Inc. and others. +// License & terms of use: http://www.unicode.org/copyright.html // Copyright (C) 2015-2016, International Business Machines // Corporation and others. All Rights Reserved. // @@ -202,7 +204,7 @@ begin format output breaks // min grouping digits not supported in any existing implementation // but could be easily added to the new DecimalFormat C code. -1000 1000 CJK +1000 1000 JK 10000 10,000 100000 100,000 1000000 1,000,000 @@ -359,7 +361,7 @@ output grouping breaks grouping2 minGroupingDigits 1,23,45,6789 4 K 2 1,23,45,6789 4 K 2 2 123,456789 6 K 6 3 -123456789 6 CJK 6 4 +123456789 6 JK 6 4 test multiplier setters set locale en_US @@ -531,12 +533,14 @@ NaN afterPrefix NaN K NaN beforeSuffix NaN K NaN afterSuffix NaN K -test apply localized patterns +test apply formerly localized patterns begin -locale localizedPattern format output breaks -en 0% 0.4376 44% +// documentation says localizedPattern is not supported, change to pattern +locale pattern format output breaks +en #0% 0.4376 44% // This next test breaks JDK. JDK doesn't multiply by 100. -fa \u06f0\u066a 0.4376 \u06f4\u06f4\u066a K +// It also is now broken in ICU4J until #10368 is fixed. +fa \u0025\u00a0\u0023\u0030 0.4376 \u200e\u066a\u00a0\u06f4\u06f4 JK test toPattern set locale en 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 3ec62190c51..8f36372b8ce 100644 --- 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 @@ -1061,9 +1061,9 @@ public class NumberFormatTest extends TestFmwk { // test locale without currency information {"root", "-1.23", "USD", "-US$ 1.23", "-USD 1.23", "-1.23 USD"}, {"root@numbers=latn", "-1.23", "USD", "-US$ 1.23", "-USD 1.23", "-1.23 USD"}, // ensure that the root locale is still used with modifiers - {"root@numbers=arab", "-1.23", "USD", "\u200F-US$ ١٫٢٣", "\u200F-USD ١٫٢٣", "\u200F-١٫٢٣ USD"}, // ensure that the root locale is still used with modifiers + {"root@numbers=arab", "-1.23", "USD", "\u200F-\u0661\u066B\u0662\u0663\u00A0US$", "\u200F-\u0661\u066B\u0662\u0663\u00A0USD", "\u200F-\u0661\u066B\u0662\u0663 USD"}, // ensure that the root locale is still used with modifiers {"es_AR", "1", "INR", "INR\u00A01,00", "INR\u00A01,00", "1,00 rupia india"}, - {"ar_EG", "1", "USD", "US$ ١٫٠٠", "USD ١٫٠٠", "١٫٠٠ دولار أمريكي"}, + {"ar_EG", "1", "USD", "١٫٠٠\u00A0US$", "١٫٠٠\u00A0USD", "١٫٠٠ دولار أمريكي"}, }; for (int i=0; i