Rename org.assertj.core.util.Dates -> org.assertj.core.util.DateUtil

src/main/java/org/assertj/core/api/AbstractDateAssert.java

@@ -16,10 +16,10 @@
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.assertj.core.util.Dates.newIsoDateFormat;
-import static org.assertj.core.util.Dates.newIsoDateTimeFormat;
-import static org.assertj.core.util.Dates.newIsoDateTimeWithMsFormat;
-import static org.assertj.core.util.Dates.newTimestampDateFormat;
+import static org.assertj.core.util.DateUtil.newIsoDateFormat;
+import static org.assertj.core.util.DateUtil.newIsoDateTimeFormat;
+import static org.assertj.core.util.DateUtil.newIsoDateTimeWithMsFormat;
+import static org.assertj.core.util.DateUtil.newTimestampDateFormat;
 import static org.assertj.core.util.Lists.newArrayList;
 import static org.assertj.core.util.Preconditions.checkNotNull;
 
@@ -1699,7 +1699,7 @@ public S isInSameDayAs(String dateAsString) {
    * <pre><code class='java'>
    * assertThat(myDate).isWithinHour(hourOfDayOf(otherDate))
    * </code></pre>
-   * see {@link org.assertj.core.util.Dates#hourOfDayOf(java.util.Date) hourOfDayOf} to get the hour of a given Date.
+   * see {@link org.assertj.core.util.DateUtil#hourOfDayOf(java.util.Date) hourOfDayOf} to get the hour of a given Date.
    * <p/>
    * Note that using a custom comparator has no effect on this assertion (see {@link #usingComparator(Comparator)}).
    *
@@ -1773,7 +1773,7 @@ public S isInSameHourWindowAs(String dateAsString) {
    * <p/>
    * If you want to compare hour only (without day, month and year), you could write :
    * <code>assertThat(myDate).isWithinHour(hourOfDayOf(otherDate))</code><br>
-   * see {@link org.assertj.core.util.Dates#hourOfDayOf(Date)} to get the hour of a given Date.
+   * see {@link org.assertj.core.util.DateUtil#hourOfDayOf(Date)} to get the hour of a given Date.
    * <p/>
    * Note that using a custom comparator has no effect on this assertion (see {@link #usingComparator(Comparator)}.
    *
@@ -1926,7 +1926,7 @@ public S isInSameMinuteWindowAs(String dateAsString) {
    * <p/>
    * If you want to compare minute field only (without hour, day, month and year), you could write :
    * <code>assertThat(myDate).isWithinMinute(minuteOf(otherDate))</code><br>
-   * using {@link org.assertj.core.util.Dates#minuteOf(Date)} to get the minute of a given Date.
+   * using {@link org.assertj.core.util.DateUtil#minuteOf(Date)} to get the minute of a given Date.
    * <p/>
    * Note that using a custom comparator has no effect on this assertion (see {@link #usingComparator(Comparator)}).
    *
@@ -2081,7 +2081,7 @@ public S isInSameSecondWindowAs(String dateAsString) {
    * <p/>
    * If you want to compare second fields only (without minute, hour, day, month and year), you could write :
    * <code>assertThat(myDate).isWithinSecond(secondOf(otherDate))</code><br>
-   * using {@link org.assertj.core.util.Dates#secondOf(Date)} to get the second of a given Date.
+   * using {@link org.assertj.core.util.DateUtil#secondOf(Date)} to get the second of a given Date.
    * <p/>
    * Note that using a custom comparator has no effect on this assertion (see {@link #usingComparator(Comparator)}).
    *

src/main/java/org/assertj/core/error/ShouldBeAfter.java

@@ -12,7 +12,7 @@
  */
 package org.assertj.core.error;
 
-import static org.assertj.core.util.Dates.parse;
+import static org.assertj.core.util.DateUtil.parse;
 
 import java.util.Date;
 

src/main/java/org/assertj/core/error/ShouldBeCloseTo.java

@@ -14,7 +14,7 @@
 
 import static java.lang.String.format;
 
-import static org.assertj.core.util.Dates.formatAsDatetimeWithMs;
+import static org.assertj.core.util.DateUtil.formatAsDatetimeWithMs;
 
 import java.util.Date;
 

src/main/java/org/assertj/core/error/ShouldBeInSameHourWindow.java

@@ -12,7 +12,7 @@
  */
 package org.assertj.core.error;
 
-import static org.assertj.core.util.Dates.formatTimeDifference;
+import static org.assertj.core.util.DateUtil.formatTimeDifference;
 
 import java.util.Date;
 

src/main/java/org/assertj/core/error/ShouldBeInSameMinuteWindow.java

@@ -12,7 +12,7 @@
  */
 package org.assertj.core.error;
 
-import static org.assertj.core.util.Dates.formatTimeDifference;
+import static org.assertj.core.util.DateUtil.formatTimeDifference;
 
 import java.util.Date;
 

src/main/java/org/assertj/core/error/ShouldBeInSameSecondWindow.java

@@ -12,7 +12,7 @@
  */
 package org.assertj.core.error;
 
-import static org.assertj.core.util.Dates.formatTimeDifference;
+import static org.assertj.core.util.DateUtil.formatTimeDifference;
 
 import java.util.Date;
 

src/main/java/org/assertj/core/internal/Dates.java

@@ -36,17 +36,17 @@
 import static org.assertj.core.error.ShouldHaveSameTime.shouldHaveSameTime;
 import static org.assertj.core.error.ShouldHaveTime.shouldHaveTime;
 import static org.assertj.core.error.ShouldNotBeBetween.shouldNotBeBetween;
-import static org.assertj.core.util.Dates.dayOfMonthOf;
-import static org.assertj.core.util.Dates.dayOfWeekOf;
-import static org.assertj.core.util.Dates.hourOfDayOf;
-import static org.assertj.core.util.Dates.millisecondOf;
-import static org.assertj.core.util.Dates.minuteOf;
-import static org.assertj.core.util.Dates.monthOf;
-import static org.assertj.core.util.Dates.now;
-import static org.assertj.core.util.Dates.secondOf;
-import static org.assertj.core.util.Dates.timeDifference;
-import static org.assertj.core.util.Dates.truncateTime;
-import static org.assertj.core.util.Dates.yearOf;
+import static org.assertj.core.util.DateUtil.dayOfMonthOf;
+import static org.assertj.core.util.DateUtil.dayOfWeekOf;
+import static org.assertj.core.util.DateUtil.hourOfDayOf;
+import static org.assertj.core.util.DateUtil.millisecondOf;
+import static org.assertj.core.util.DateUtil.minuteOf;
+import static org.assertj.core.util.DateUtil.monthOf;
+import static org.assertj.core.util.DateUtil.now;
+import static org.assertj.core.util.DateUtil.secondOf;
+import static org.assertj.core.util.DateUtil.timeDifference;
+import static org.assertj.core.util.DateUtil.truncateTime;
+import static org.assertj.core.util.DateUtil.yearOf;
 
 import java.util.Calendar;
 import java.util.Comparator;

src/main/java/org/assertj/core/presentation/StandardRepresentation.java

@@ -21,7 +21,7 @@
 import java.util.Comparator;
 import java.util.Date;
 
-import org.assertj.core.util.Dates;
+import org.assertj.core.util.DateUtil;
 
 /**
  * Standard java object representation.
@@ -69,7 +69,7 @@ private static String toStringOf(Comparator<?> comparator) {
   }
 
   private static String toStringOf(Calendar c) {
-    return Dates.formatAsDatetime(c);
+    return DateUtil.formatAsDatetime(c);
   }
 
   private static String toStringOf(Class<?> c) {
@@ -85,7 +85,7 @@ private static String toStringOf(Character c) {
   }
 
   private static String toStringOf(Date d) {
-    return Dates.formatAsDatetimeWithMs(d);
+    return DateUtil.formatAsDatetimeWithMs(d);
   }
 
   private static String toStringOf(Float f) {

src/main/java/org/assertj/core/util/Dates.java → src/main/java/org/assertj/core/util/DateUtil.java

@@ -31,7 +31,7 @@
  * @author Joel Costigliola
  * @author Mikhail Mazursky
  */
-public class Dates {
+public class DateUtil {
 
   /**
    * ISO 8601 date format (yyyy-MM-dd), example : <code>2003-04-23</code>

src/test/java/org/assertj/core/api/AutoCloseableBDDSoftAssertionsTest.java

@@ -14,7 +14,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
-import static org.assertj.core.util.Dates.parseDatetime;
+import static org.assertj.core.util.DateUtil.parseDatetime;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;

src/test/java/org/assertj/core/api/AutoCloseableSoftAssertionsTest.java

@@ -14,7 +14,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
-import static org.assertj.core.util.Dates.parseDatetime;
+import static org.assertj.core.util.DateUtil.parseDatetime;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;

src/test/java/org/assertj/core/api/BDDSoftAssertionsTest.java

@@ -14,7 +14,7 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.fail;
-import static org.assertj.core.util.Dates.parseDatetime;
+import static org.assertj.core.util.DateUtil.parseDatetime;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;

src/test/java/org/assertj/core/api/SoftAssertionsTest.java

@@ -17,7 +17,7 @@
 import static org.assertj.core.api.Assertions.fail;
 import static org.assertj.core.api.Assertions.shouldHaveThrown;
 import static org.assertj.core.api.Assertions.tuple;
-import static org.assertj.core.util.Dates.parseDatetime;
+import static org.assertj.core.util.DateUtil.parseDatetime;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;

src/test/java/org/assertj/core/api/date/DateAssert_hasSameTimeAsDateInString_Test.java

@@ -15,7 +15,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.test.ErrorMessages.dateToCompareActualWithIsNull;
 import static org.assertj.core.test.ExpectedException.none;
-import static org.assertj.core.util.Dates.parseDatetime;
+import static org.assertj.core.util.DateUtil.parseDatetime;
 import static org.assertj.core.util.FailureMessages.actualIsNull;
 
 import java.sql.Timestamp;

src/test/java/org/assertj/core/api/date/DateAssert_setLenientDateParsing.java

@@ -16,8 +16,8 @@
 import static org.assertj.core.api.Assertions.failBecauseExceptionWasNotThrown;
 import static org.assertj.core.api.Assertions.setLenientDateParsing;
 import static org.assertj.core.test.ExpectedException.none;
-import static org.assertj.core.util.Dates.parseDatetime;
-import static org.assertj.core.util.Dates.parseDatetimeWithMs;
+import static org.assertj.core.util.DateUtil.parseDatetime;
+import static org.assertj.core.util.DateUtil.parseDatetimeWithMs;
 
 import java.util.Date;
 

src/test/java/org/assertj/core/api/date/DateAssert_with_string_based_date_representation_Test.java

@@ -16,8 +16,8 @@
 import static org.assertj.core.api.Assertions.registerCustomDateFormat;
 import static org.assertj.core.api.Assertions.useDefaultDateFormatsOnly;
 import static org.assertj.core.test.ExpectedException.none;
-import static org.assertj.core.util.Dates.parseDatetime;
-import static org.assertj.core.util.Dates.parseDatetimeWithMs;
+import static org.assertj.core.util.DateUtil.parseDatetime;
+import static org.assertj.core.util.DateUtil.parseDatetimeWithMs;
 
 import java.sql.Timestamp;
 import java.text.ParseException;
@@ -26,7 +26,7 @@
 
 import org.assertj.core.api.DateAssertBaseTest;
 import org.assertj.core.test.ExpectedException;
-import org.assertj.core.util.Dates;
+import org.assertj.core.util.DateUtil;
 import org.junit.After;
 import org.junit.Rule;
 import org.junit.Test;
@@ -57,16 +57,16 @@ public void date_assertion_using_default_date_string_representation() {
     assertThat(datetime).isEqualTo("2003-04-26T03:01:02.000");
     assertThat(datetime).isEqualTo("2003-04-26T03:01:02");
     // date is supported
-    final Date date = Dates.parse("2003-04-26");
+    final Date date = DateUtil.parse("2003-04-26");
     assertThat(date).isEqualTo("2003-04-26");
     assertThat(date).isEqualTo("2003-04-26T00:00:00");
     assertThat(date).isEqualTo("2003-04-26T00:00:00.000");
   }
 
   @Test
   public void date_assertion_should_support_timestamp_string_representation() throws ParseException {
-    Date date = Dates.newTimestampDateFormat().parse("2015-05-08 11:30:00.560");
-    String timestampAsString = Dates.newTimestampDateFormat().format(new Timestamp(date.getTime()));
+    Date date = DateUtil.newTimestampDateFormat().parse("2015-05-08 11:30:00.560");
+    String timestampAsString = DateUtil.newTimestampDateFormat().format(new Timestamp(date.getTime()));
 
     assertThat(date).isEqualTo(timestampAsString);
   }
@@ -84,7 +84,7 @@ public void should_fail_if_given_date_string_representation_cant_be_parsed_with_
 
   @Test
   public void date_assertion_using_custom_date_string_representation() {
-    final Date date = Dates.parse("2003-04-26");
+    final Date date = DateUtil.parse("2003-04-26");
     assertThat(date).withDateFormat("yyyy/MM/dd").isEqualTo("2003/04/26");
     assertThat(date).isEqualTo("2003/04/26");
   }
@@ -94,7 +94,7 @@ public void should_fail_if_given_date_string_representation_cant_be_parsed_with_
     thrown.expectAssertionError("Failed to parse 2003 04 26 with any of these date formats: "
                                 +
                                 "[yyyy/MM/dd'T'HH:mm:ss, yyyy/MM/dd, yyyy-MM-dd'T'HH:mm:ss.SSS, yyyy-MM-dd HH:mm:ss.SSS, yyyy-MM-dd'T'HH:mm:ss, yyyy-MM-dd]");
-    final Date date = Dates.parse("2003-04-26");
+    final Date date = DateUtil.parse("2003-04-26");
     registerCustomDateFormat("yyyy/MM/dd'T'HH:mm:ss");
     // registering again has no effect
     registerCustomDateFormat("yyyy/MM/dd'T'HH:mm:ss");
@@ -103,7 +103,7 @@ public void should_fail_if_given_date_string_representation_cant_be_parsed_with_
 
   @Test
   public void date_assertion_using_custom_date_string_representation_then_switching_back_to_defaults_date_formats() {
-    final Date date = Dates.parse("2003-04-26");
+    final Date date = DateUtil.parse("2003-04-26");
     // chained assertions
     assertThat(date).withDateFormat("yyyy/MM/dd").isEqualTo("2003/04/26")
                     .withDefaultDateFormatsOnly().isEqualTo("2003-04-26");
@@ -114,7 +114,7 @@ public void date_assertion_using_custom_date_string_representation_then_switchin
 
   @Test
   public void use_custom_date_formats_set_from_Assertions_entry_point() {
-    final Date date = Dates.parse("2003-04-26");
+    final Date date = DateUtil.parse("2003-04-26");
 
     registerCustomDateFormat("yyyy/MM/dd'T'HH:mm:ss");
 
@@ -144,7 +144,7 @@ public void use_custom_date_formats_set_from_Assertions_entry_point() {
   @Test
   public void use_custom_date_formats_first_then_defaults_to_parse_a_date() {
     // using default formats should work
-    final Date date = Dates.parse("2003-04-26");
+    final Date date = DateUtil.parse("2003-04-26");
     assertThat(date).isEqualTo("2003-04-26");
 
     try {

src/test/java/org/assertj/core/error/ShouldBeAfterOrEqualsTo_create_Test.java

@@ -15,7 +15,7 @@
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.error.ShouldBeAfterOrEqualsTo.shouldBeAfterOrEqualsTo;
-import static org.assertj.core.util.Dates.parse;
+import static org.assertj.core.util.DateUtil.parse;
 
 import org.assertj.core.description.Description;
 import org.assertj.core.description.TextDescription;

src/test/java/org/assertj/core/error/ShouldBeAfter_create_Test.java

@@ -15,7 +15,7 @@
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.error.ShouldBeAfter.shouldBeAfter;
-import static org.assertj.core.util.Dates.parse;
+import static org.assertj.core.util.DateUtil.parse;
 
 import org.assertj.core.description.Description;
 import org.assertj.core.description.TextDescription;

src/test/java/org/assertj/core/error/ShouldBeBeforeOrEqualsTo_create_Test.java

@@ -15,7 +15,7 @@
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.error.ShouldBeBeforeOrEqualsTo.shouldBeBeforeOrEqualsTo;
-import static org.assertj.core.util.Dates.parse;
+import static org.assertj.core.util.DateUtil.parse;
 
 import org.assertj.core.description.Description;
 import org.assertj.core.description.TextDescription;

src/test/java/org/assertj/core/error/ShouldBeBefore_create_Test.java

@@ -15,7 +15,7 @@
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.error.ShouldBeBefore.shouldBeBefore;
-import static org.assertj.core.util.Dates.parse;
+import static org.assertj.core.util.DateUtil.parse;
 
 import org.assertj.core.description.Description;
 import org.assertj.core.description.TextDescription;

src/test/java/org/assertj/core/error/ShouldBeBetween_create_Test.java

@@ -15,7 +15,7 @@
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.error.ShouldBeBetween.shouldBeBetween;
-import static org.assertj.core.util.Dates.parse;
+import static org.assertj.core.util.DateUtil.parse;
 
 import org.assertj.core.description.Description;
 import org.assertj.core.description.TextDescription;

src/test/java/org/assertj/core/error/ShouldBeCloseTo_create_Test.java

@@ -21,7 +21,7 @@
 import org.assertj.core.description.Description;
 import org.assertj.core.description.TextDescription;
 import org.assertj.core.presentation.StandardRepresentation;
-import org.assertj.core.util.Dates;
+import org.assertj.core.util.DateUtil;
 import org.junit.Test;
 
 
@@ -34,8 +34,8 @@ public class ShouldBeCloseTo_create_Test {
 
   @Test
   public void should_create_error_message_with_period_boundaries_included() throws ParseException {
-    ErrorMessageFactory factory = shouldBeCloseTo(Dates.parseDatetimeWithMs("2011-01-01T00:00:00.000"),
-        Dates.parseDatetimeWithMs("2011-01-01T00:00:00.101"), 100, 101);
+    ErrorMessageFactory factory = shouldBeCloseTo(DateUtil.parseDatetimeWithMs("2011-01-01T00:00:00.000"),
+        DateUtil.parseDatetimeWithMs("2011-01-01T00:00:00.101"), 100, 101);
     String message = factory.create(new TextDescription("Test"), new StandardRepresentation());
     assertThat(message).isEqualTo(String.format(
         "[Test] %nExpecting:%n <2011-01-01T00:00:00.000>%nto be close to:%n <2011-01-01T00:00:00.101>%nby less than 100ms but difference was 101ms"

src/test/java/org/assertj/core/error/ShouldBeEqualWithTimePrecision_create_Test.java

@@ -15,7 +15,7 @@
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.error.ShouldBeEqualWithTimePrecision.shouldBeEqual;
-import static org.assertj.core.util.Dates.parseDatetimeWithMs;
+import static org.assertj.core.util.DateUtil.parseDatetimeWithMs;
 
 import java.text.ParseException;
 import java.util.concurrent.TimeUnit;

src/test/java/org/assertj/core/error/ShouldBeInSameDay_create_Test.java

@@ -15,7 +15,7 @@
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.error.ShouldBeInSameDay.shouldBeInSameDay;
-import static org.assertj.core.util.Dates.parse;
+import static org.assertj.core.util.DateUtil.parse;
 
 import org.assertj.core.description.Description;
 import org.assertj.core.description.TextDescription;

src/test/java/org/assertj/core/error/ShouldBeInSameHourWindow_create_Test.java

@@ -15,7 +15,7 @@
 import static java.lang.String.format;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.error.ShouldBeInSameHourWindow.shouldBeInSameHourWindow;
-import static org.assertj.core.util.Dates.parseDatetimeWithMs;
+import static org.assertj.core.util.DateUtil.parseDatetimeWithMs;
 
 import java.text.ParseException;