ICU-6806 Updated DateTimeGeneratorTest/TestOrdering. The test code is preserved,...

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 36ec3cf76f860d474aeb4f188ae3b9dfe12d93c3..92ceebfdee20be4e95be003002fd7f5d3dc04905 100644 (file)
--- 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));
         }
     }