ICU-9722 Fixed some test case issues when JDK TimeZone implementation is used (mostly...

X-SVN-Rev: 33335

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/calendar/DataDrivenCalendarTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/calendar/DataDrivenCalendarTest.java
index ea1cb377e9097f332b4c92bdc342f37845eb41be..6beb18da0f8afb9ec0598e7396a89df0370ca909 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/calendar/DataDrivenCalendarTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/calendar/DataDrivenCalendarTest.java
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (C) 2007-2010, International Business Machines Corporation and         *
+ * Copyright (C) 2007-2013, International Business Machines Corporation and         *
  * others. All Rights Reserved.                                                *
  *******************************************************************************
  */
@@ -270,7 +270,11 @@ public class DataDrivenCalendarTest extends ModuleTest {
                         logln(caseString + " SUCCESS: got=expected="+toDate);
                         logln("PASS: "+caseString+" matched! ");
                     } else {
-                        if (caseString.equals("[case 31]") && TimeZone.getDefaultTimeZoneType() == TimeZone.TIMEZONE_JDK) {
+                       // Note: With JDK TimeZone implementation, tz offset on dates earlier than
+                       // mid-1900 might be different from the TZDB. Following test cases are
+                       // failing because of this.
+                        if ((caseString.equals("[case 31]") || caseString.equals("[case 36]")) 
+                                       && TimeZone.getDefaultTimeZoneType() == TimeZone.TIMEZONE_JDK) {
                             logln(caseString + " FAIL(expected): got " + 
                                     toCalendar.getTimeInMillis() + "  expected " + 
                                     toDate);

diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java
index b82283f890180feb3cd320491350a316b07f8cdf..b79d01601df598df67618174634e46a1a4669440 100644 (file)
--- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java
+++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/format/TimeZoneFormatTest.java
@@ -14,6 +14,7 @@ import java.util.Date;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Set;
+import java.util.TreeSet;
 import java.util.regex.Pattern;
 
 import com.ibm.icu.impl.ZoneMeta;
@@ -34,7 +35,9 @@ import com.ibm.icu.util.ULocale;
 
 public class TimeZoneFormatTest extends com.ibm.icu.dev.test.TestFmwk {
 
-    public static void main(String[] args) throws Exception {
+       private static boolean JDKTZ = (TimeZone.getDefaultTimeZoneType() == TimeZone.TIMEZONE_JDK);
+
+       public static void main(String[] args) throws Exception {
         new TimeZoneFormatTest().run(args);
     }
 
@@ -110,7 +113,12 @@ public class TimeZoneFormatTest extends com.ibm.icu.dev.test.TestFmwk {
             LOCALES = new ULocale[] {new ULocale("en"), new ULocale("en_CA"), new ULocale("fr"), new ULocale("zh_Hant")};
         }
 
-        String[] tzids = TimeZone.getAvailableIDs();
+        String[] tzids;
+        if (JDKTZ) {
+            tzids = java.util.TimeZone.getAvailableIDs();
+        } else {
+            tzids = TimeZone.getAvailableIDs();
+        }
         int[] inOffsets = new int[2];
         int[] outOffsets = new int[2];
 
@@ -241,8 +249,7 @@ public class TimeZoneFormatTest extends com.ibm.icu.dev.test.TestFmwk {
                             } else {
                                 // Specific or generic: raw offset must be preserved.
                                 if (inOffsets[0] != outOffsets[0]) {
-                                    if (TimeZone.getDefaultTimeZoneType() == TimeZone.TIMEZONE_JDK
-                                            && tzids[tzidx].startsWith("SystemV/")) {
+                                    if (JDKTZ && tzids[tzidx].startsWith("SystemV/")) {
                                         // JDK uses rule SystemV for these zones while
                                         // ICU handles these zones as aliases of existing time zones
                                         if (REALLY_VERBOSE_LOG) {
@@ -350,7 +357,20 @@ public class TimeZoneFormatTest extends com.ibm.icu.dev.test.TestFmwk {
                 SimpleDateFormat sdf = new SimpleDateFormat(pattern, LOCALES[locidx]);
                 boolean minutesOffset = MINUTES_OFFSET.contains(PATTERNS[patidx]);
 
-                Set<String> ids = TimeZone.getAvailableIDs(SystemTimeZoneType.CANONICAL, null, null);
+                Set<String> ids = null;
+                if (JDKTZ) {
+                       ids = new TreeSet<String>();
+                       String[] jdkIDs = java.util.TimeZone.getAvailableIDs();
+                       for (String jdkID : jdkIDs) {
+                               String tmpID = TimeZone.getCanonicalID(jdkID);
+                               if (tmpID != null) {
+                                       ids.add(tmpID);
+                               }
+                       }
+                } else {
+                       ids = TimeZone.getAvailableIDs(SystemTimeZoneType.CANONICAL, null, null);                       
+                }
+
                 for (String id : ids) {
                     if (PATTERNS[patidx].equals("V")) {
                         // Some zones do not have short ID assigned, such as Asia/Riyadh87.