This is the mail archive of the mauve-patches@sources.redhat.com mailing list for the Mauve project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

java.util.SimpleTimeZone


I've committed some fixes for the check12.java and check14.java test
cases for the SimpleTimeZone class (see attached patch).  Instances of
the following problems were fixed:

(1) Calls to the getOffset() method should specify the local *standard*
time, not the day-light-savings adjusted time;

(2) The setStartRule(int, int, int, int, boolean) method doesn't use -ve
parameters;

(3) The final check uses the default locale, changed this to Locale.US.

Regards,

Dave Gilbert
http://www.jfree.org
Index: ChangeLog
===================================================================
RCS file: /cvs/mauve/mauve/ChangeLog,v
retrieving revision 1.716
diff -u -r1.716 ChangeLog
--- ChangeLog	30 Oct 2004 22:30:03 -0000	1.716
+++ ChangeLog	31 Oct 2004 21:14:06 -0000
@@ -1,3 +1,9 @@
+2004-10-31  David Gilbert  <david.gilbert@object-refinery.com>
+
+	* gnu/testlet/java/util/SimpleTimeZone/check12.java,
+	gnu/testlet/java/util/SimpleTimeZone/check14.java: fixed bugs in
+	various checks. 
+
 2004-10-31  Robert Schuster <thebohemian@gmx.net>
 
 	* gnu/testlet/java/beans/PropertyEditorSupport/getSource.java:
Index: gnu/testlet/java/util/SimpleTimeZone/check12.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/java/util/SimpleTimeZone/check12.java,v
retrieving revision 1.3
diff -u -r1.3 check12.java
--- gnu/testlet/java/util/SimpleTimeZone/check12.java	21 May 2004 05:48:00 -0000	1.3
+++ gnu/testlet/java/util/SimpleTimeZone/check12.java	31 Oct 2004 21:14:11 -0000
@@ -25,10 +25,17 @@
 
 package gnu.testlet.java.util.SimpleTimeZone;
 
-import gnu.testlet.Testlet;
 import gnu.testlet.TestHarness;
-import java.util.*;
-import java.text.*;
+import gnu.testlet.Testlet;
+
+import java.text.DateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.Locale;
+import java.util.SimpleTimeZone;
+import java.util.TimeZone;
+
 public class check12 implements Testlet
 {
   public void test (TestHarness harness)
@@ -52,87 +59,87 @@
 
     // Test 1/2 hour before dst
     off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.APRIL, 10, Calendar.SATURDAY, 41400000);
-    harness.check(off, rawOff);
+    harness.check(off, rawOff);            // check 1
     
     // Test 1/2 hour into dst
     off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.APRIL, 10, Calendar.SATURDAY, 45000000);
-    harness.check(off, rawOff + dstOff);
+    harness.check(off, rawOff + dstOff);   // check 2
 
     // Test end rule
-    off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.SEPTEMBER, 10, Calendar.FRIDAY, 41400000);
-    harness.check(off, rawOff + dstOff);
-    off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.SEPTEMBER, 10, Calendar.FRIDAY, 45000000);
-    harness.check(off, rawOff);
+    off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.SEPTEMBER, 10, Calendar.FRIDAY, 41400000 - dstOff);
+    harness.check(off, rawOff + dstOff);   // check 3
+    
+    off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.SEPTEMBER, 10, Calendar.FRIDAY, 45000000 - dstOff);
+    harness.check(off, rawOff);            // check 4
 
     // Test that Nth dayofweek works with day of month rules
     tz.setStartRule(Calendar.APRIL, 2, Calendar.SATURDAY, 43200000);
 
     off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.APRIL, 10, Calendar.SATURDAY, 41400000);
-    harness.check(off, rawOff);
+    harness.check(off, rawOff);            // check 5
     off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.APRIL, 10, Calendar.SATURDAY, 45000000);
-    harness.check(off, rawOff + dstOff);
+    harness.check(off, rawOff + dstOff);   // check 6
 
     tz.setEndRule(Calendar.SEPTEMBER, 2, Calendar.FRIDAY, 43200000);
 
-    off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.SEPTEMBER, 10, Calendar.FRIDAY, 41400000);
-    harness.check(off, rawOff + dstOff);
-    off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.SEPTEMBER, 10, Calendar.FRIDAY, 45000000);
-    harness.check(off, rawOff);
+    off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.SEPTEMBER, 10, Calendar.FRIDAY, 41400000 - dstOff);
+    harness.check(off, rawOff + dstOff);   // check 7
+    off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.SEPTEMBER, 10, Calendar.FRIDAY, 45000000 - dstOff);
+    harness.check(off, rawOff);            // check 8
 
     // Test that -Nth dayofweek works with day of month rules
     tz.setStartRule(Calendar.APRIL, -3, Calendar.SATURDAY, 43200000);
 
     off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.APRIL, 10, Calendar.SATURDAY, 41400000);
-    harness.check(off, rawOff);
+    harness.check(off, rawOff);            // check 9
     off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.APRIL, 10, Calendar.SATURDAY, 45000000);
-    harness.check(off, rawOff + dstOff);
+    harness.check(off, rawOff + dstOff);   // check 10
 
     tz.setEndRule(Calendar.SEPTEMBER, -3, Calendar.FRIDAY, 43200000);
 
-    off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.SEPTEMBER, 10, Calendar.FRIDAY, 41400000);
-    harness.check(off, rawOff + dstOff);
-    off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.SEPTEMBER, 10, Calendar.FRIDAY, 45000000);
-    harness.check(off, rawOff);
+    off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.SEPTEMBER, 10, Calendar.FRIDAY, 41400000 - dstOff);
+    harness.check(off, rawOff + dstOff);   // check 11
+    off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.SEPTEMBER, 10, Calendar.FRIDAY, 45000000 - dstOff);
+    harness.check(off, rawOff);            // check 12
 
     // Friday on or before April 5, 2004 is April 2
     // Test arguments get overidden and perform correctly
-    tz.setStartRule(Calendar.APRIL, -5, -Calendar.FRIDAY, 43200000, false);
-
+    tz.setStartRule(Calendar.APRIL, 5, Calendar.FRIDAY, 43200000, false);
     off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.APRIL, 2, Calendar.FRIDAY, 41400000);
-    harness.check(off, rawOff);
+    harness.check(off, rawOff);            // check 13
     off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.APRIL, 2, Calendar.FRIDAY, 45000000);
-    harness.check(off, rawOff + dstOff);
+    harness.check(off, rawOff + dstOff);   // check 14
     
     tz.setEndRule(Calendar.SEPTEMBER, -15, -Calendar.FRIDAY, 43200000);
 
-    off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.SEPTEMBER, 10, Calendar.FRIDAY, 41400000);
-    harness.check(off, rawOff + dstOff);
-    off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.SEPTEMBER, 10, Calendar.FRIDAY, 45000000);
-    harness.check(off, rawOff);
+    off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.SEPTEMBER, 10, Calendar.FRIDAY, 41400000 - dstOff);
+    harness.check(off, rawOff + dstOff);   // check 15
+    off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.SEPTEMBER, 10, Calendar.FRIDAY, 45000000 - dstOff);
+    harness.check(off, rawOff);            // check 16
 
     // Sunday on or after April 5, 2004 is April 11
     // Test arguments get overidden and perform correctly
-    tz.setStartRule(Calendar.APRIL, 5, -Calendar.SATURDAY, 43200000, true);
+    tz.setStartRule(Calendar.APRIL, 5, Calendar.SUNDAY, 43200000, true);
 
-    off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.APRIL, 11, Calendar.SATURDAY, 41400000);
-    harness.check(off, rawOff);
-    off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.APRIL, 11, Calendar.SATURDAY, 45000000);
-    harness.check(off, rawOff + dstOff);
+    off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.APRIL, 11, Calendar.SUNDAY, 41400000);
+    harness.check(off, rawOff);            // check 17
+    off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.APRIL, 11, Calendar.SUNDAY, 45000000);
+    harness.check(off, rawOff + dstOff);   // check 18
 
     tz.setEndRule(Calendar.SEPTEMBER, 6, -Calendar.FRIDAY, 43200000);
 
-    off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.SEPTEMBER, 10, Calendar.FRIDAY, 41400000);
-    harness.check(off, rawOff + dstOff);
-    off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.SEPTEMBER, 10, Calendar.FRIDAY, 45000000);
-    harness.check(off, rawOff);
+    off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.SEPTEMBER, 10, Calendar.FRIDAY, 41400000 - dstOff);
+    harness.check(off, rawOff + dstOff);   // check 19
+    off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.SEPTEMBER, 10, Calendar.FRIDAY, 45000000 - dstOff);
+    harness.check(off, rawOff);            // check 20
 
     // Currently broken in GCJ
     tz.setEndRule(Calendar.SEPTEMBER, -6, -Calendar.TUESDAY, 43200000);
 
-    off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.AUGUST, 31, Calendar.TUESDAY, 41400000);
-    harness.check(off, rawOff + dstOff);
-    off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.AUGUST, 31, Calendar.TUESDAY, 45000000);
-    harness.check(off, rawOff);
+    off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.AUGUST, 31, Calendar.TUESDAY, 41400000 - dstOff);
+    harness.check(off, rawOff + dstOff);   // check 21
+    off = tz.getOffset(GregorianCalendar.AD, 2004, Calendar.AUGUST, 31, Calendar.TUESDAY, 45000000 - dstOff);
+    harness.check(off, rawOff);            // check 22
 
     // This looks like a Date or DateFormat test, but is here because there was a bug in SimpleTimeZone
     // PR libgcj/8321
@@ -141,8 +148,8 @@
     DateFormat dateFormat = DateFormat.getDateTimeInstance(
                         DateFormat.SHORT,
                         DateFormat.LONG,
-                        Locale.getDefault());
+                        Locale.US);
     dateFormat.setTimeZone(zone);
-    harness.check("10/15/2002 2:12:36 PM EDT", dateFormat.format(date));
+    harness.check(dateFormat.format(date), "10/15/02 2:12:36 PM EDT");
   }
 }
Index: gnu/testlet/java/util/SimpleTimeZone/check14.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/java/util/SimpleTimeZone/check14.java,v
retrieving revision 1.2
diff -u -r1.2 check14.java
--- gnu/testlet/java/util/SimpleTimeZone/check14.java	7 Jun 2004 03:11:43 -0000	1.2
+++ gnu/testlet/java/util/SimpleTimeZone/check14.java	31 Oct 2004 21:14:11 -0000
@@ -72,36 +72,36 @@
     std = tzstd.getOffset(GregorianCalendar.AD, 2000, Calendar.MAY, 10, Calendar.WEDNESDAY, 41400000);
     utc = tzutc.getOffset(GregorianCalendar.AD, 2000, Calendar.MAY, 10, Calendar.WEDNESDAY, 41400000);
 
-    harness.check(wall, rawOff);
-    harness.check(std, rawOff);
-    harness.check(utc, rawOff);
+    harness.check(wall, rawOff);  // check 1
+    harness.check(std, rawOff);   // check 2
+    harness.check(utc, rawOff);   // check 3
     
     // test 1/2 hour into dst
     wall = tzwall.getOffset(GregorianCalendar.AD, 2000, Calendar.MAY, 10, Calendar.WEDNESDAY, 45000000);
     std = tzstd.getOffset(GregorianCalendar.AD, 2000, Calendar.MAY, 10, Calendar.WEDNESDAY, 45000000);
     utc = tzutc.getOffset(GregorianCalendar.AD, 2000, Calendar.MAY, 10, Calendar.WEDNESDAY, 45000000);
 
-    harness.check(wall, rawOff + dstOff);
-    harness.check(std, rawOff + dstOff);
-    harness.check(utc, rawOff + dstOff);
+    harness.check(wall, rawOff + dstOff);  // check 4
+    harness.check(std, rawOff + dstOff);   // check 5
+    harness.check(utc, rawOff + dstOff);   // check 6
     
     // test 1/2 hour before fall back to standard time
-    wall = tzwall.getOffset(GregorianCalendar.AD, 2000, Calendar.OCTOBER, 10, Calendar.TUESDAY, 41400000);
-    std = tzstd.getOffset(GregorianCalendar.AD, 2000, Calendar.OCTOBER, 10, Calendar.TUESDAY, 41400000);
-    utc = tzutc.getOffset(GregorianCalendar.AD, 2000, Calendar.OCTOBER, 10, Calendar.TUESDAY, 41400000);
+    wall = tzwall.getOffset(GregorianCalendar.AD, 2000, Calendar.OCTOBER, 10, Calendar.TUESDAY, 41400000 - dstOff);
+    std = tzstd.getOffset(GregorianCalendar.AD, 2000, Calendar.OCTOBER, 10, Calendar.TUESDAY, 41400000 - dstOff);
+    utc = tzutc.getOffset(GregorianCalendar.AD, 2000, Calendar.OCTOBER, 10, Calendar.TUESDAY, 41400000 - dstOff);
 
-    harness.check(wall, rawOff + dstOff);
-    harness.check(std, rawOff + dstOff);
-    harness.check(utc, rawOff + dstOff);
+    harness.check(wall, rawOff + dstOff);  // check 7
+    harness.check(std, rawOff + dstOff);   // check 8
+    harness.check(utc, rawOff + dstOff);   // check 9
     
     // test 1/2 hour after fall back to standard time
-    wall = tzwall.getOffset(GregorianCalendar.AD, 2000, Calendar.OCTOBER, 10, Calendar.TUESDAY, 45000000);
-    std = tzstd.getOffset(GregorianCalendar.AD, 2000, Calendar.OCTOBER, 10, Calendar.TUESDAY, 45000000);
-    utc = tzutc.getOffset(GregorianCalendar.AD, 2000, Calendar.OCTOBER, 10, Calendar.TUESDAY, 45000000);
+    wall = tzwall.getOffset(GregorianCalendar.AD, 2000, Calendar.OCTOBER, 10, Calendar.TUESDAY, 45000000 - dstOff);
+    std = tzstd.getOffset(GregorianCalendar.AD, 2000, Calendar.OCTOBER, 10, Calendar.TUESDAY, 45000000 - dstOff);
+    utc = tzutc.getOffset(GregorianCalendar.AD, 2000, Calendar.OCTOBER, 10, Calendar.TUESDAY, 45000000 - dstOff);
 
-    harness.check(wall, rawOff);
-    harness.check(std, rawOff);
-    harness.check(utc, rawOff);
+    harness.check(wall, rawOff);           // check 10
+    harness.check(std, rawOff);            // check 11
+    harness.check(utc, rawOff);            // check 12
 
   }
 }

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]