From ac5a216f767c6defa4da720c6ecb3baa05e30254 Mon Sep 17 00:00:00 2001 From: Kaiyuan Wang Date: Tue, 20 Sep 2016 23:59:04 -0500 Subject: [PATCH] Add unit tests for DateUtils.toCalendar(Date, TimeZone) --- .../commons/lang3/time/DateUtilsTest.java | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java b/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java index 0b80ab633..280d681a6 100644 --- a/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java +++ b/src/test/java/org/apache/commons/lang3/time/DateUtilsTest.java @@ -693,6 +693,43 @@ public void testToCalendar() { // expected } } + + //----------------------------------------------------------------------- + @Test + public void testToCalendarWithDate() { + assertEquals("Convert Date and TimeZone to a Calendar, but failed to get the Date back", date1, DateUtils.toCalendar(date1, zone).getTime()); + try { + DateUtils.toCalendar(null, zone); + fail("Expected NullPointerException to be thrown"); + } catch(final NullPointerException npe) { + // expected + } + } + + //----------------------------------------------------------------------- + @Test + public void testToCalendarWithTimeZone() { + assertEquals("Convert Date and TimeZone to a Calendar, but failed to get the TimeZone back", zone, DateUtils.toCalendar(date1, zone).getTimeZone()); + try { + DateUtils.toCalendar(date1, null); + fail("Expected NullPointerException to be thrown"); + } catch(final NullPointerException npe) { + // expected + } + } + + //----------------------------------------------------------------------- + @Test + public void testToCalendarWithDateAndTimeZone() { + try { + Calendar c = DateUtils.toCalendar(date2, defaultZone); + assertEquals("Convert Date and TimeZone to a Calendar, but failed to get the Date back", date2, c.getTime()); + assertEquals("Convert Date and TimeZone to a Calendar, but failed to get the TimeZone back", defaultZone, c.getTimeZone()); + // expected + } catch(final NullPointerException npe) { + fail("Expected NullPointerException to be thrown"); + } + } //----------------------------------------------------------------------- /**