From 73635200a4e04831a2f46d36ad2fbd3c1444aacd Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Tue, 31 Jan 2012 08:44:39 +0000 Subject: [PATCH] ICU-9044 Fix timebomb to use isICUVersionBefore() (J) X-SVN-Rev: 31282 --- .../src/com/ibm/icu/dev/test/calendar/ChineseTest.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/calendar/ChineseTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/calendar/ChineseTest.java index 0e9e27461cd..5a5cbd613b4 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/calendar/ChineseTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/calendar/ChineseTest.java @@ -266,11 +266,6 @@ public class ChineseTest extends CalendarTest { java.util.Calendar tempcal = java.util.Calendar.getInstance(); tempcal.clear(); - // time bomb test until ticket #9043 fixes the ambiguous era problem. - if (VersionInfo.ICU_VERSION.compareTo(VersionInfo.getInstance(50,0,2)) <= 0) { - return; - } - Date[] DATA = new Date[2]; tempcal.set(2001, Calendar.MAY, 22); DATA[0] = tempcal.getTime(); @@ -284,6 +279,8 @@ public class ChineseTest extends CalendarTest { Date e = fmt.parse(s); if (e.equals(DATA[i])) { logln("Ok: " + DATA[i] + " -> " + s + " -> " + e); + } else if (isICUVersionBefore(50, 1)) { // until ticket #9043 fixes the ambiguous era problem + logln("Ambiguous parse fails: " + DATA[i] + " -> " + s + " -> " + e); } else { errln("FAIL: " + DATA[i] + " -> " + s + " -> " + e); } -- 2.40.0