Skip to content

Commit 31752ec

Browse files
committed
Fix Timestamp areEqual with LocalDate
1 parent e918c11 commit 31752ec

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ else if (valueType == ValueType.DATE_TIME) {
115115
return areEqual(value, DateTimeValue.from((Timestamp) expected));
116116
} else if (expected instanceof LocalDateTime) {
117117
return areEqual(value, DateTimeValue.from((LocalDateTime) expected));
118+
} else if (expected instanceof LocalDate) {
119+
return areEqual(value, DateValue.from((LocalDate) expected));
118120
}
119121
}
120122
else {

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,12 @@ public void test_are_equal_for_dates() throws Exception {
268268
public void test_are_equal_for_timestamp_and_dates() throws Exception {
269269
assertThat(Values.areEqual(getValue(null, Timestamp.valueOf("2007-12-23 00:00:00.000000000")), (Object) DateValue.of(2007, 12, 23)))
270270
.isTrue();
271+
assertThat(Values.areEqual(getValue(null, Timestamp.valueOf("2007-12-23 00:00:00.000000000")), LocalDate.of(2007, 12, 23)))
272+
.isTrue();
271273
assertThat(Values.areEqual(getValue(null, Timestamp.valueOf("2007-12-23 00:00:00.000000000")), (Object) DateValue.of(2007, 1, 2)))
272274
.isFalse();
275+
assertThat(Values.areEqual(getValue(null, Timestamp.valueOf("2007-12-23 00:00:00.000000000")), LocalDate.of(2007, 1, 2)))
276+
.isFalse();
273277
assertThat(Values.areEqual(getValue(null, ""), (Object) DateValue.of(2007, 12, 23))).isFalse();
274278
assertThat(Values.areEqual(getValue(null, Timestamp.valueOf("2007-12-23 00:00:00.000000000")), (Object) null)).isFalse();
275279

0 commit comments

Comments
 (0)