From: Yoshito Umaoka Date: Wed, 10 Oct 2012 15:12:05 +0000 (+0000) Subject: ICU-6806 Updated DateTimeGeneratorTest/TestOrdering. The test code is preserved,... X-Git-Tag: milestone-59-0-1~3441 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=76b8cbd675e56801d587407b40b18cf0011d108e;p=icu ICU-6806 Updated DateTimeGeneratorTest/TestOrdering. The test code is preserved, but no longer report ordering differences as errors. X-SVN-Rev: 32587 --- diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java index 36ec3cf76f8..92ceebfdee2 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java @@ -568,15 +568,9 @@ public class DateTimeGeneratorTest extends TestFmwk { DateOrder order1 = getOrdering(style1, uLocale); DateOrder order2 = getOrdering(style2, uLocale); if (!order1.hasSameOrderAs(order2)) { - if (order1.monthLength == order2.monthLength) { // error if have same month length, different ordering - if (isICUVersionBefore(50, 1, 0)) { // ticket#6806 - logln(showOrderComparison(uLocale, style1, style2, order1, order2)); - } else { - errln(showOrderComparison(uLocale, style1, style2, order1, order2)); - } - } else if (isVerbose() && order1.monthLength > 2 && order2.monthLength > 2) { // warn if both are not numeric - logln(showOrderComparison(uLocale, style1, style2, order1, order2)); - } + // Note: This test case was updated by #6806 and no longer reports + // ordering difference as an error case. + logln(showOrderComparison(uLocale, style1, style2, order1, order2)); } }