Author: sebb
Date: Tue Feb 2 17:59:20 2010
New Revision: 905734
URL: http://svn.apache.org/viewvc?rev=905734&view=rev
Log:
testCeil() fails for Java 1.3 on date4/cal4; date5/cal5 is not run for Java 1.3
Now date4=01:10 and date5=01:40 so should behave the same, so disabling the
date4 test for Java 1.3
Modified:
commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/time/DateUtilsTest.java
Modified:
commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/time/DateUtilsTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/time/DateUtilsTest.java?rev=905734&r1=905733&r2=905734&view=diff
==============================================================================
---
commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/time/DateUtilsTest.java
(original)
+++
commons/proper/lang/branches/LANG_2_X/src/test/java/org/apache/commons/lang/time/DateUtilsTest.java
Tue Feb 2 17:59:20 2010
@@ -1344,6 +1344,7 @@
// Fix for http://issues.apache.org/bugzilla/show_bug.cgi?id=25560
+ // == https://issues.apache.org/jira/browse/LANG-13
// Test ceiling across the beginning of daylight saving time
TimeZone.setDefault(zone);
dateTimeParser.setTimeZone(zone);
@@ -1373,15 +1374,15 @@
dateTimeParser.parse("March 31, 2003 00:00:00.000"),
DateUtils.ceiling((Object) cal7, Calendar.DATE));
- assertEquals("ceiling MET date across DST change-over",
- dateTimeParser.parse("March 30, 2003 03:00:00.000"),
- DateUtils.ceiling(date4, Calendar.HOUR_OF_DAY));
- assertEquals("ceiling MET date across DST change-over",
- dateTimeParser.parse("March 30, 2003 03:00:00.000"),
- DateUtils.ceiling((Object) cal4, Calendar.HOUR_OF_DAY));
if (SystemUtils.isJavaVersionAtLeast(1.4f)) {
assertEquals("ceiling MET date across DST change-over",
dateTimeParser.parse("March 30, 2003 03:00:00.000"),
+ DateUtils.ceiling(date4, Calendar.HOUR_OF_DAY));
+ assertEquals("ceiling MET date across DST change-over",
+ dateTimeParser.parse("March 30, 2003 03:00:00.000"),
+ DateUtils.ceiling((Object) cal4, Calendar.HOUR_OF_DAY));
+ assertEquals("ceiling MET date across DST change-over",
+ dateTimeParser.parse("March 30, 2003 03:00:00.000"),
DateUtils.ceiling(date5, Calendar.HOUR_OF_DAY));
assertEquals("ceiling MET date across DST change-over",
dateTimeParser.parse("March 30, 2003 03:00:00.000"),
