You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by br...@apache.org on 2015/04/06 22:05:59 UTC
svn commit: r1671683 -
/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java
Author: britter
Date: Mon Apr 6 20:05:58 2015
New Revision: 1671683
URL: http://svn.apache.org/r1671683
Log:
Build requires at least Java 6 - check for Java version can be removed
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java
Modified: commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java?rev=1671683&r1=1671682&r2=1671683&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java (original)
+++ commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java Mon Apr 6 20:05:58 2015
@@ -16,8 +16,6 @@
*/
package org.apache.commons.lang3.time;
-import static org.apache.commons.lang3.JavaVersion.JAVA_1_4;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -830,28 +828,24 @@ public class DateUtilsTest {
assertEquals("round MET date across DST change-over",
dateTimeParser.parse("March 30, 2003 01:00:00.000"),
DateUtils.round((Object) cal4, Calendar.HOUR_OF_DAY));
- if (SystemUtils.isJavaVersionAtLeast(JAVA_1_4)) {
- assertEquals("round MET date across DST change-over",
- dateTimeParser.parse("March 30, 2003 03:00:00.000"),
- DateUtils.round(date5, Calendar.HOUR_OF_DAY));
- assertEquals("round MET date across DST change-over",
- dateTimeParser.parse("March 30, 2003 03:00:00.000"),
- DateUtils.round((Object) cal5, Calendar.HOUR_OF_DAY));
- assertEquals("round MET date across DST change-over",
- dateTimeParser.parse("March 30, 2003 03:00:00.000"),
- DateUtils.round(date6, Calendar.HOUR_OF_DAY));
- assertEquals("round MET date across DST change-over",
- dateTimeParser.parse("March 30, 2003 03:00:00.000"),
- DateUtils.round((Object) cal6, Calendar.HOUR_OF_DAY));
- assertEquals("round MET date across DST change-over",
- dateTimeParser.parse("March 30, 2003 04:00:00.000"),
- DateUtils.round(date7, Calendar.HOUR_OF_DAY));
- assertEquals("round MET date across DST change-over",
- dateTimeParser.parse("March 30, 2003 04:00:00.000"),
- DateUtils.round((Object) cal7, Calendar.HOUR_OF_DAY));
- } else {
- this.warn("WARNING: Some date rounding tests not run since the current version is " + SystemUtils.JAVA_SPECIFICATION_VERSION);
- }
+ assertEquals("round MET date across DST change-over",
+ dateTimeParser.parse("March 30, 2003 03:00:00.000"),
+ DateUtils.round(date5, Calendar.HOUR_OF_DAY));
+ assertEquals("round MET date across DST change-over",
+ dateTimeParser.parse("March 30, 2003 03:00:00.000"),
+ DateUtils.round((Object) cal5, Calendar.HOUR_OF_DAY));
+ assertEquals("round MET date across DST change-over",
+ dateTimeParser.parse("March 30, 2003 03:00:00.000"),
+ DateUtils.round(date6, Calendar.HOUR_OF_DAY));
+ assertEquals("round MET date across DST change-over",
+ dateTimeParser.parse("March 30, 2003 03:00:00.000"),
+ DateUtils.round((Object) cal6, Calendar.HOUR_OF_DAY));
+ assertEquals("round MET date across DST change-over",
+ dateTimeParser.parse("March 30, 2003 04:00:00.000"),
+ DateUtils.round(date7, Calendar.HOUR_OF_DAY));
+ assertEquals("round MET date across DST change-over",
+ dateTimeParser.parse("March 30, 2003 04:00:00.000"),
+ DateUtils.round((Object) cal7, Calendar.HOUR_OF_DAY));
TimeZone.setDefault(defaultZone);
dateTimeParser.setTimeZone(defaultZone);
}
@@ -1125,11 +1119,6 @@ public class DateUtilsTest {
*/
@Test
public void testTruncateLang59() throws Exception {
- if (!SystemUtils.isJavaVersionAtLeast(JAVA_1_4)) {
- this.warn("WARNING: Test for LANG-59 not run since the current version is " + SystemUtils.JAVA_SPECIFICATION_VERSION);
- return;
- }
-
// Set TimeZone to Mountain Time
final TimeZone MST_MDT = TimeZone.getTimeZone("MST7MDT");
TimeZone.setDefault(MST_MDT);
@@ -1417,28 +1406,24 @@ public class DateUtilsTest {
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(JAVA_1_4)) {
- 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"),
- DateUtils.ceiling((Object) cal5, Calendar.HOUR_OF_DAY));
- assertEquals("ceiling MET date across DST change-over",
- dateTimeParser.parse("March 30, 2003 04:00:00.000"),
- DateUtils.ceiling(date6, Calendar.HOUR_OF_DAY));
- assertEquals("ceiling MET date across DST change-over",
- dateTimeParser.parse("March 30, 2003 04:00:00.000"),
- DateUtils.ceiling((Object) cal6, Calendar.HOUR_OF_DAY));
- assertEquals("ceiling MET date across DST change-over",
- dateTimeParser.parse("March 30, 2003 04:00:00.000"),
- DateUtils.ceiling(date7, Calendar.HOUR_OF_DAY));
- assertEquals("ceiling MET date across DST change-over",
- dateTimeParser.parse("March 30, 2003 04:00:00.000"),
- DateUtils.ceiling((Object) cal7, Calendar.HOUR_OF_DAY));
- } else {
- this.warn("WARNING: Some date ceiling tests not run since the current version is " + SystemUtils.JAVA_SPECIFICATION_VERSION);
- }
+ 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"),
+ DateUtils.ceiling((Object) cal5, Calendar.HOUR_OF_DAY));
+ assertEquals("ceiling MET date across DST change-over",
+ dateTimeParser.parse("March 30, 2003 04:00:00.000"),
+ DateUtils.ceiling(date6, Calendar.HOUR_OF_DAY));
+ assertEquals("ceiling MET date across DST change-over",
+ dateTimeParser.parse("March 30, 2003 04:00:00.000"),
+ DateUtils.ceiling((Object) cal6, Calendar.HOUR_OF_DAY));
+ assertEquals("ceiling MET date across DST change-over",
+ dateTimeParser.parse("March 30, 2003 04:00:00.000"),
+ DateUtils.ceiling(date7, Calendar.HOUR_OF_DAY));
+ assertEquals("ceiling MET date across DST change-over",
+ dateTimeParser.parse("March 30, 2003 04:00:00.000"),
+ DateUtils.ceiling((Object) cal7, Calendar.HOUR_OF_DAY));
TimeZone.setDefault(defaultZone);
dateTimeParser.setTimeZone(defaultZone);