Skip to content

Commit 6fcfa36

Browse files
author
Gerald Unterrainer
committed
fix tests
1 parent 4e0ff90 commit 6fcfa36

File tree

3 files changed

+9
-35
lines changed

3 files changed

+9
-35
lines changed
Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
package info.unterrainer.commons.rdbutils.converters;
22

33
import java.sql.Timestamp;
4-
import java.time.Instant;
54
import java.time.LocalDateTime;
6-
import java.time.ZoneId;
7-
import java.time.ZonedDateTime;
85
import java.time.temporal.ChronoUnit;
96

107
import jakarta.persistence.AttributeConverter;
118
import jakarta.persistence.Converter;
12-
import info.unterrainer.commons.jreutils.DateUtils;
139

1410
@Converter()
1511
public class LocalDateTimeConverter implements AttributeConverter<LocalDateTime, Timestamp> {
@@ -23,12 +19,10 @@ public Timestamp convertToDatabaseColumn(final LocalDateTime entityValue) {
2319
return timestamp;
2420
}
2521

26-
// FIXXXING
2722
@Override
2823
public LocalDateTime convertToEntityAttribute(final Timestamp dbValue) {
2924
if (dbValue == null)
3025
return null;
31-
LocalDateTime ldt = DateUtils.epochToUtcLocalDateTime(dbValue.getTime());
32-
return ldt.withNano(dbValue.getNanos());
26+
return dbValue.toLocalDateTime();
3327
}
3428
}

src/main/java/info/unterrainer/commons/rdbutils/converters/ZonedDateTimeConverter.java

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/test/java/info/unterrainer/commons/rdbutils/LocalDateTimeConverterTests.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import java.sql.Timestamp;
66
import java.time.LocalDateTime;
7+
import java.time.temporal.ChronoUnit;
78

89
import org.junit.jupiter.api.Test;
910

@@ -18,14 +19,18 @@ public class LocalDateTimeConverterTests {
1819
public void conversionFromLocalDateTimeToTimestamp() {
1920
LocalDateTime d = DateUtils.nowUtc();
2021
Timestamp ts = converter.convertToDatabaseColumn(d);
21-
assertThat(DateUtils.utcLocalDateTimeToEpoch(d)).isEqualTo(ts.getTime());
22+
assertThat(ts.toLocalDateTime()).isEqualTo(d.truncatedTo(ChronoUnit.MICROS));
2223
}
2324

2425
@Test
2526
public void conversionFromTimestampToLocalDateTime() {
26-
Timestamp ts = new Timestamp(DateUtils.utcLocalDateTimeToEpoch(DateUtils.nowUtc()));
27+
LocalDateTime now = DateUtils.nowUtc();
28+
Timestamp ts = new Timestamp(DateUtils.utcLocalDateTimeToEpoch(now));
2729
LocalDateTime d = converter.convertToEntityAttribute(ts);
2830

29-
assertThat(ts.getTime()).isEqualTo(DateUtils.utcLocalDateTimeToEpoch(d));
31+
Timestamp timestamp = Timestamp.valueOf(d);
32+
timestamp.setNanos(d.truncatedTo(ChronoUnit.MICROS).getNano());
33+
34+
assertThat(d).isEqualTo(ts.toLocalDateTime());
3035
}
3136
}

0 commit comments

Comments
 (0)