Improve areEqual to support JSR-310 types

Author: sciencesakura

src/main/java/org/assertj/db/util/Values.java

@@ -21,6 +21,9 @@
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.text.ParseException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.UUID;
 
 /**
@@ -86,6 +89,8 @@ else if (valueType == ValueType.DATE) {
         return areEqual(value, (String) expected);
       } else if (expected instanceof Date) {
         return areEqual(value, DateValue.from((Date) expected));
+      } else if (expected instanceof LocalDate) {
+        return areEqual(value, DateValue.from((LocalDate) expected));
       }
     }
     else if (valueType == ValueType.TIME) {
@@ -95,6 +100,8 @@ else if (valueType == ValueType.TIME) {
         return areEqual(value, (String) expected);
       } else if (expected instanceof Time) {
         return areEqual(value, TimeValue.from((Time) expected));
+      } else if (expected instanceof LocalTime) {
+        return areEqual(value, TimeValue.from((LocalTime) expected));
       }
     }
     else if (valueType == ValueType.DATE_TIME) {
@@ -106,6 +113,8 @@ else if (valueType == ValueType.DATE_TIME) {
         return areEqual(value, (String) expected);
       } else if (expected instanceof Timestamp) {
         return areEqual(value, DateTimeValue.from((Timestamp) expected));
+      } else if (expected instanceof LocalDateTime) {
+        return areEqual(value, DateTimeValue.from((LocalDateTime) expected));
       }
     }
     else {

src/test/java/org/assertj/db/util/Values_AreEqual_Value_And_Object_Test.java

@@ -24,6 +24,9 @@
 import java.sql.Date;
 import java.sql.Time;
 import java.sql.Timestamp;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -254,6 +257,8 @@ public void test_are_equal_for_dates() throws Exception {
     assertThat(Values.areEqual(getValue(null, Date.valueOf("2007-12-23")), (Object) "2007-12-23T00:00")).isTrue();
     assertThat(Values.areEqual(getValue(null, Date.valueOf("2007-12-23")), (Object) "2007-12-23T00:00:00")).isTrue();
     assertThat(Values.areEqual(getValue(null, Date.valueOf("2007-12-23")), (Object) "2007-12-23T00:00:00.000000000")).isTrue();
+    assertThat(Values.areEqual(getValue(null, Date.valueOf("2007-12-23")), Date.valueOf("2007-12-23"))).isTrue();
+    assertThat(Values.areEqual(getValue(null, Date.valueOf("2007-12-23")), LocalDate.of(2007, 12, 23))).isTrue();
   }
 
   /**
@@ -287,25 +292,28 @@ public void test_are_equal_for_times() throws Exception {
     assertThat(Values.areEqual(getValue(null, Time.valueOf("09:01:06")), (Object) null)).isFalse();
     assertThat(Values.areEqual(getValue(null, Time.valueOf("09:01:06")), (Object) "09:01:06")).isTrue();
     assertThat(Values.areEqual(getValue(null, Time.valueOf("09:01:06")), (Object) "09:01:06.000000000")).isTrue();
+    assertThat(Values.areEqual(getValue(null, Time.valueOf("09:01:06")), Time.valueOf("09:01:06"))).isTrue();
+    assertThat(Values.areEqual(getValue(null, Time.valueOf("09:01:06")), LocalTime.of(9, 1, 6))).isTrue();
   }
 
   /**
    * This method tests the {@code areEqual} method for {@code TimeValue}s.
    */
   @Test
   public void test_are_equal_for_timestamps() throws Exception {
-    assertThat(
-            Values.areEqual(getValue(null, Timestamp.valueOf("2007-12-23 09:01:06.000000003")),
-                            (Object) DateTimeValue.of(DateValue.of(2007, 12, 23), TimeValue.of(9, 1, 6, 3)))).isTrue();
-    assertThat(
-            Values.areEqual(getValue(null, Timestamp.valueOf("2007-12-23 09:01:06.000000003")),
-                            (Object) DateTimeValue.of(DateValue.of(2007, 12, 23), TimeValue.of(9, 1, 5, 3)))).isFalse();
-    assertThat(Values.areEqual(getValue(null, ""), (Object) DateTimeValue.of(DateValue.of(2007, 12, 23), TimeValue.of(9, 1, 6, 3))))
-            .isFalse();
+    assertThat(Values.areEqual(getValue(null, Timestamp.valueOf("2007-12-23 09:01:06.000000003")),
+            (Object) DateTimeValue.of(DateValue.of(2007, 12, 23), TimeValue.of(9, 1, 6, 3)))).isTrue();
+    assertThat(Values.areEqual(getValue(null, Timestamp.valueOf("2007-12-23 09:01:06.000000003")),
+            (Object) DateTimeValue.of(DateValue.of(2007, 12, 23), TimeValue.of(9, 1, 5, 3)))).isFalse();
+    assertThat(Values.areEqual(getValue(null, ""), (Object) DateTimeValue.of(DateValue.of(2007, 12, 23),
+            TimeValue.of(9, 1, 6, 3)))).isFalse();
     assertThat(Values.areEqual(getValue(null, Timestamp.valueOf("2007-12-23 09:01:06.000000003")), (Object) null)).isFalse();
-    assertThat(
-            Values.areEqual(getValue(null, Timestamp.valueOf("2007-12-23 09:01:06.000000003")),
-                            (Object) "2007-12-23T09:01:06.000000003")).isTrue();
+    assertThat(Values.areEqual(getValue(null, Timestamp.valueOf("2007-12-23 09:01:06.000000003")),
+            (Object) "2007-12-23T09:01:06.000000003")).isTrue();
+    assertThat(Values.areEqual(getValue(null, Timestamp.valueOf("2007-12-23 09:01:06.000000003")),
+            Timestamp.valueOf("2007-12-23 09:01:06.000000003"))).isTrue();
+    assertThat(Values.areEqual(getValue(null, Timestamp.valueOf("2007-12-23 09:01:06.000000003")),
+            LocalDateTime.of(2007, 12, 23, 9, 1, 6, 3))).isTrue();
   }
 
   /**