ICU-6658 Fixed build/test problems on Java 1.3 environment.
X-SVN-Rev: 25215
diff --git a/src/com/ibm/icu/dev/test/calendar/CalendarRegression.java b/src/com/ibm/icu/dev/test/calendar/CalendarRegression.java
index 7bce6e6..592746c 100644
--- a/src/com/ibm/icu/dev/test/calendar/CalendarRegression.java
+++ b/src/com/ibm/icu/dev/test/calendar/CalendarRegression.java
@@ -1,6 +1,6 @@
/**
*******************************************************************************
- * Copyright (C) 2000-2008, International Business Machines Corporation and *
+ * Copyright (C) 2000-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@@ -770,13 +770,13 @@
public void Test4108764() {
java.util.Calendar tempcal = java.util.Calendar.getInstance();
tempcal.clear();
- tempcal.set(1997, Calendar.MARCH, 15, 12, 00, 00);
+ tempcal.set(1997, Calendar.FEBRUARY, 15, 12, 00, 00);
Date d00 = tempcal.getTime();
- tempcal.set(1997, Calendar.MARCH, 15, 12, 00, 56);
+ tempcal.set(1997, Calendar.FEBRUARY, 15, 12, 00, 56);
Date d01 = tempcal.getTime();
- tempcal.set(1997, Calendar.MARCH, 15, 12, 34, 00);
+ tempcal.set(1997, Calendar.FEBRUARY, 15, 12, 34, 00);
Date d10 = tempcal.getTime();
- tempcal.set(1997, Calendar.MARCH, 15, 12, 34, 56);
+ tempcal.set(1997, Calendar.FEBRUARY, 15, 12, 34, 56);
Date d11 = tempcal.getTime();
tempcal.set(1997, Calendar.JANUARY, 15, 12, 34, 56);
Date dM = tempcal.getTime();
diff --git a/src/com/ibm/icu/dev/test/calendar/CompatibilityTest.java b/src/com/ibm/icu/dev/test/calendar/CompatibilityTest.java
index e77bf83..4762fb8 100644
--- a/src/com/ibm/icu/dev/test/calendar/CompatibilityTest.java
+++ b/src/com/ibm/icu/dev/test/calendar/CompatibilityTest.java
@@ -1,6 +1,6 @@
/**
*******************************************************************************
- * Copyright (C) 2000-2008, International Business Machines Corporation and *
+ * Copyright (C) 2000-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@@ -339,9 +339,9 @@
}
cal.clear();
- cal.set(1985, 3, 2, 11, 49);
+ cal.set(1985, 2, 2, 11, 49);
tempcal.clear();
- tempcal.set(1985, 3, 2, 11, 49);
+ tempcal.set(1985, 2, 2, 11, 49);
if (cal.getTime().getTime() != tempcal.getTime().getTime()) {
errln("FAIL: Calendar.set(5 args) failed");
logln(" Got: " + cal.getTime() + " Expected: " + tempcal.getTime());
diff --git a/src/com/ibm/icu/dev/test/timezone/TimeZoneBoundaryTest.java b/src/com/ibm/icu/dev/test/timezone/TimeZoneBoundaryTest.java
index 85a5a3c..9049e50 100644
--- a/src/com/ibm/icu/dev/test/timezone/TimeZoneBoundaryTest.java
+++ b/src/com/ibm/icu/dev/test/timezone/TimeZoneBoundaryTest.java
@@ -1,6 +1,6 @@
/**
*******************************************************************************
- * Copyright (C) 2000-2005, International Business Machines Corporation and *
+ * Copyright (C) 2000-2009, International Business Machines Corporation and *
* others. All Rights Reserved. *
*******************************************************************************
*/
@@ -430,7 +430,13 @@
TimeZone.setDefault(save);
}
- if (true)
+ // We no longer use ICU TimeZone implementation for Java
+ // default TimeZone. Java 1.3 or older version do not
+ // support historic transitions, therefore, the test below
+ // will fail on such environment (with the latest TimeZone
+ // patch for US 2007+ rule).
+ String javaver = System.getProperty("java.version", "1.3");
+ if (!javaver.startsWith("1.3"))
{
// This only works in PST/PDT
TimeZone.setDefault(safeGetTimeZone("PST"));
diff --git a/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java b/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
index 4a62c57..4ff9c13 100644
--- a/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
+++ b/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java
@@ -1477,7 +1477,7 @@
int dstSavings = jdkCal.get(java.util.Calendar.DST_OFFSET);
int[] offsets = new int[2];
- icuCaracas.getOffset(jdkCal.getTimeInMillis(), false, offsets);
+ icuCaracas.getOffset(jdkCal.getTime().getTime(), false, offsets);
boolean isTimeZoneSynchronized = true;
