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