From: Peter Edberg Date: Sat, 6 Sep 2014 06:14:06 +0000 (+0000) Subject: ICU-11173 CLDR tags/release-26-d03 into ICU4J trunk, remove logKnownIssue 11219,... X-Git-Tag: milestone-59-0-1~1604 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f35551771f70c6b078a6adc23f340b33c9d2a9b9;p=icu ICU-11173 CLDR tags/release-26-d03 into ICU4J trunk, remove logKnownIssue 11219, fix test for cldrbug:7868 X-SVN-Rev: 36376 --- diff --git a/icu4j/main/shared/data/icudata.jar b/icu4j/main/shared/data/icudata.jar index c70e20d0f5a..24b569382d7 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:053c6c650ffc3eae06bc91cfa27788a2c2f36feac9929d2799857b1bc4d416d1 -size 11619215 +oid sha256:fea86b24de700bb8a0680d6b4119725eb4bb2b2f21c8526e355939c361cb6d87 +size 11619074 diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index a98a36d0f44..7f2f2c664ff 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:fec7343c363e6c663af13de797326aa9c98a6ba29777adac0634aaf832ff6052 +oid sha256:1d6e63cd7b8a115333f6f9b9b46ce3f894d0accac6cd81b72b40000c9525bf92 size 90808 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java index 8a37b739108..ba6beb14e7c 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateFormatTest.java @@ -4085,10 +4085,10 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk { new MonthPatternItem( "en@calendar=dangi", DateFormat.LONG, "Month3bis 2, ren-chen", "Month4 2, ren-chen", "Month5 1, ren-chen" ), new MonthPatternItem( "en@calendar=dangi", DateFormat.SHORT, "3bis/2/29", "4/2/29", "5/1/29" ), new MonthPatternItem( "en@calendar=dangi", -2, "78x29-3bis-2", "78x29-4-2", "78x29-5-1" ), - new MonthPatternItem( "ko@calendar=dangi", DateFormat.LONG, "\uC784\uC9C4\uB144 \uC7243\uC6D4\uC6D4 2\uC77C", // problem, see cldrbug 7868: + new MonthPatternItem( "ko@calendar=dangi", DateFormat.LONG, "\uC784\uC9C4\uB144 \uC7243\uC6D4 2\uC77C", "\uC784\uC9C4\uB144 4\uC6D4 2\uC77C", "\uC784\uC9C4\uB144 5\uC6D4 1\uC77C" ), - new MonthPatternItem( "ko@calendar=dangi", DateFormat.SHORT, "29. \uC7243\uC6D4. 2.", // possible problem, see cldrbug 7868: + new MonthPatternItem( "ko@calendar=dangi", DateFormat.SHORT, "29. \uC7243. 2.", "29. 4. 2.", "29. 5. 1." ), }; @@ -4178,9 +4178,6 @@ public class DateFormatTest extends com.ibm.icu.dev.test.TestFmwk { new TestNonGregoItem( "he@calendar=hebrew", DateFormat.LONG, cafti_he_hebrew_long ), }; for (TestNonGregoItem item: items) { - if (item.locale.equals("he@calendar=hebrew") && logKnownIssue("11219", "Skip tests that depend on hebr numbers in the thousands")) { - continue; - } ULocale locale = new ULocale(item.locale); DateFormat dfmt = DateFormat.getDateInstance(item.style, locale); Calendar cal = dfmt.getCalendar(); 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 5d5eb728ac8..d2fbbb6f95e 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 @@ -1544,9 +1544,6 @@ public class NumberFormatTest extends com.ibm.icu.dev.test.TestFmwk { for (TestNumberingSystemItem item : DATA) { - if (item.localeName.equals("en_US@numbers=hebr") && logKnownIssue("11219", "Skip tests that depend on hebr numbers in the thousands")) { - continue; - } ULocale loc = new ULocale(item.localeName); NumberFormat fmt = NumberFormat.getInstance(loc); if (item.isRBNF) {