Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improve some assertions in time zone tests + rename

This commit is contained in:
Gavin 2022-12-08 00:28:28 +01:00 committed by Gavin King
parent 3196f2584b
commit 2c8d6d719b
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
hibernate-core/src/test/java/org/hibernate/orm/test/timezones/ExplicitZonedTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/timezones/JDBCTimeZoneZonedTest.java
View File

@ -12,6 +12,7 @@ import org.hibernate.testing.orm.junit.SessionFactoryScope;
import org.hibernate.testing.orm.junit.Setting;
import org.junit.jupiter.api.Test;
import java.time.Instant;
import java.time.OffsetDateTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
@ -20,11 +21,11 @@ import java.time.temporal.ChronoUnit;
import static org.junit.jupiter.api.Assertions.assertEquals;
@DomainModel(annotatedClasses = ExplicitZonedTest.Zoned.class)
@DomainModel(annotatedClasses = JDBCTimeZoneZonedTest.Zoned.class)
@SessionFactory
@ServiceRegistry(settings = {@Setting(name = AvailableSettings.TIMEZONE_DEFAULT_STORAGE, value = "NORMALIZE"),
@Setting(name = AvailableSettings.JDBC_TIME_ZONE, value = "GMT+5")})
public class ExplicitZonedTest {
public class JDBCTimeZoneZonedTest {
@Test void test(SessionFactoryScope scope) {
ZonedDateTime nowZoned = ZonedDateTime.now().withZoneSameInstant( ZoneId.of("CET") );
@ -38,17 +39,19 @@ public class ExplicitZonedTest {
});
scope.inSession( s-> {
Zoned z = s.find(Zoned.class, id);
ZoneId systemZone = ZoneId.systemDefault();
ZoneOffset systemOffset = systemZone.getRules().getOffset( Instant.now() );
if ( scope.getSessionFactory().getJdbcServices().getDialect() instanceof SybaseDialect) {
// Sybase with jTDS driver has 1/300th sec precision
assertEquals( nowZoned.toInstant().truncatedTo(ChronoUnit.SECONDS), z.zonedDateTime.toInstant().truncatedTo(ChronoUnit.SECONDS));
assertEquals( nowOffset.toInstant().truncatedTo(ChronoUnit.SECONDS), z.offsetDateTime.toInstant().truncatedTo(ChronoUnit.SECONDS));
}
else {
assertEquals( nowZoned.toInstant(), z.zonedDateTime.toInstant() );
assertEquals( nowOffset.toInstant(), z.offsetDateTime.toInstant() );
assertEquals( nowZoned.withZoneSameInstant(systemZone), z.zonedDateTime );
assertEquals( nowOffset.withOffsetSameInstant(systemOffset), z.offsetDateTime );
}
assertEquals( ZoneId.systemDefault(), z.zonedDateTime.getZone() );
assertEquals( ZoneOffset.systemDefault().normalized(), z.offsetDateTime.getOffset().normalized() );
assertEquals( systemZone, z.zonedDateTime.getZone() );
assertEquals( systemOffset, z.offsetDateTime.getOffset() );
});
}

11
hibernate-core/src/test/java/org/hibernate/orm/test/timezones/PassThruZonedTest.java
View File

@ -12,6 +12,7 @@ import org.hibernate.testing.orm.junit.SessionFactoryScope;
import org.hibernate.testing.orm.junit.Setting;
import org.junit.jupiter.api.Test;
import java.time.Instant;
import java.time.OffsetDateTime;
import java.time.ZoneId;
import java.time.ZoneOffset;
@ -37,17 +38,19 @@ public class PassThruZonedTest {
});
scope.inSession( s-> {
Zoned z = s.find(Zoned.class, id);
ZoneId systemZone = ZoneId.systemDefault();
ZoneOffset systemOffset = systemZone.getRules().getOffset( Instant.now() );
if ( scope.getSessionFactory().getJdbcServices().getDialect() instanceof SybaseDialect) {
// Sybase with jTDS driver has 1/300th sec precision
assertEquals( nowZoned.toInstant().truncatedTo(ChronoUnit.SECONDS), z.zonedDateTime.toInstant().truncatedTo(ChronoUnit.SECONDS));
assertEquals( nowOffset.toInstant().truncatedTo(ChronoUnit.SECONDS), z.offsetDateTime.toInstant().truncatedTo(ChronoUnit.SECONDS));
}
else {
assertEquals( nowZoned.toInstant(), z.zonedDateTime.toInstant() );
assertEquals( nowOffset.toInstant(), z.offsetDateTime.toInstant() );
assertEquals( nowZoned.withZoneSameInstant(systemZone), z.zonedDateTime );
assertEquals( nowOffset.withOffsetSameInstant(systemOffset), z.offsetDateTime );
}
assertEquals( ZoneId.systemDefault(), z.zonedDateTime.getZone() );
assertEquals( ZoneOffset.systemDefault().normalized(), z.offsetDateTime.getOffset().normalized() );
assertEquals( systemZone, z.zonedDateTime.getZone() );
assertEquals( systemOffset, z.offsetDateTime.getOffset() );
});
}

4
hibernate-core/src/test/java/org/hibernate/orm/test/timezones/NormalizedZonedTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/timezones/UTCNormalizedZonedTest.java
View File

@ -20,10 +20,10 @@ import java.time.temporal.ChronoUnit;
import static org.junit.jupiter.api.Assertions.assertEquals;
@DomainModel(annotatedClasses = NormalizedZonedTest.Zoned.class)
@DomainModel(annotatedClasses = UTCNormalizedZonedTest.Zoned.class)
@SessionFactory
@ServiceRegistry(settings = @Setting(name = AvailableSettings.TIMEZONE_DEFAULT_STORAGE, value = "NORMALIZE_UTC"))
public class NormalizedZonedTest {
public class UTCNormalizedZonedTest {
@Test void test(SessionFactoryScope scope) {
ZonedDateTime nowZoned = ZonedDateTime.now().withZoneSameInstant( ZoneId.of("CET") );