1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
|
Index: source/org/jfree/data/time/Week.java
===================================================================
--- source/org/jfree/data/time/Week.java (revision 691)
+++ source/org/jfree/data/time/Week.java (revision 692)
@@ -65,6 +65,7 @@
* 09-Jan-2007 : Fixed bug in next() (DG);
* 28-Aug-2007 : Added new constructor to avoid problem in creating new
* instances (DG);
+ * 19-Dec-2007 : Fixed bug in deprecated constructor (DG);
*
*/
@@ -171,7 +172,7 @@
*/
public Week(Date time, TimeZone zone) {
// defer argument checking...
- this(time, RegularTimePeriod.DEFAULT_TIME_ZONE, Locale.getDefault());
+ this(time, zone, Locale.getDefault());
}
/**
Index: tests/org/jfree/data/time/junit/WeekTests.java
===================================================================
--- tests/org/jfree/data/time/junit/WeekTests.java (revision 691)
+++ tests/org/jfree/data/time/junit/WeekTests.java (revision 692)
@@ -43,6 +43,8 @@
* 01-Jun-2006 : Added testBug1498805() method (DG);
* 11-Jul-2007 : Fixed bad time zone assumption (DG);
* 28-Aug-2007 : Added test for constructor problem (DG);
+ * 19-Dec-2007 : Set default locale for tests that are sensitive
+ * to the locale (DG);
*
*/
@@ -288,22 +290,36 @@
* A test case for bug 1448828.
*/
public void testBug1448828() {
- Week w = new Week(new Date(1136109830000l),
- TimeZone.getTimeZone("GMT"));
- assertEquals(2005, w.getYearValue());
- assertEquals(52, w.getWeek());
+ Locale saved = Locale.getDefault();
+ Locale.setDefault(Locale.UK);
+ try {
+ Week w = new Week(new Date(1136109830000l),
+ TimeZone.getTimeZone("GMT"));
+ assertEquals(2005, w.getYearValue());
+ assertEquals(52, w.getWeek());
+ }
+ finally {
+ Locale.setDefault(saved);
+ }
}
/**
* A test case for bug 1498805.
*/
public void testBug1498805() {
- TimeZone zone = TimeZone.getTimeZone("GMT");
- GregorianCalendar gc = new GregorianCalendar(zone);
- gc.set(2005, Calendar.JANUARY, 1, 12, 0, 0);
- Week w = new Week(gc.getTime(), zone);
- assertEquals(53, w.getWeek());
- assertEquals(new Year(2004), w.getYear());
+ Locale saved = Locale.getDefault();
+ Locale.setDefault(Locale.UK);
+ try {
+ TimeZone zone = TimeZone.getTimeZone("GMT");
+ GregorianCalendar gc = new GregorianCalendar(zone);
+ gc.set(2005, Calendar.JANUARY, 1, 12, 0, 0);
+ Week w = new Week(gc.getTime(), zone);
+ assertEquals(53, w.getWeek());
+ assertEquals(new Year(2004), w.getYear());
+ }
+ finally {
+ Locale.setDefault(saved);
+ }
}
/**
@@ -325,8 +341,15 @@
*/
public void testGetFirstMillisecondWithTimeZone() {
Week w = new Week(47, 1950);
- TimeZone zone = TimeZone.getTimeZone("America/Los_Angeles");
- assertEquals(-603216000000L, w.getFirstMillisecond(zone));
+ Locale saved = Locale.getDefault();
+ Locale.setDefault(Locale.US);
+ try {
+ TimeZone zone = TimeZone.getTimeZone("America/Los_Angeles");
+ assertEquals(-603302400000L, w.getFirstMillisecond(zone));
+ }
+ finally {
+ Locale.setDefault(saved);
+ }
// try null calendar
boolean pass = false;
@@ -335,8 +358,8 @@
}
catch (NullPointerException e) {
pass = true;
- }
- assertTrue(pass);
+ }
+ assertTrue(pass);
}
/**
@@ -378,10 +401,17 @@
*/
public void testGetLastMillisecondWithTimeZone() {
Week w = new Week(2, 1950);
- TimeZone zone = TimeZone.getTimeZone("America/Los_Angeles");
- assertEquals(-629827200001L, w.getLastMillisecond(zone));
-
- // try null calendar
+ Locale saved = Locale.getDefault();
+ Locale.setDefault(Locale.US);
+ try {
+ TimeZone zone = TimeZone.getTimeZone("America/Los_Angeles");
+ assertEquals(-629913600001L, w.getLastMillisecond(zone));
+ }
+ finally {
+ Locale.setDefault(saved);
+ }
+
+ // try null zone
boolean pass = false;
try {
w.getLastMillisecond((TimeZone) null);
@@ -389,7 +419,7 @@
catch (NullPointerException e) {
pass = true;
}
- assertTrue(pass);
+ assertTrue(pass);
}
/**
|
GitWeb