Skip to content

yet another time zone test #9276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 18, 2024
+146 −0
Merged

yet another time zone test #9276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 68 additions & 0 deletions hibernate-core/src/test/java/org/hibernate/orm/test/instant/InstantTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
/*
* SPDX-License-Identifier: LGPL-2.1-or-later
* Copyright Red Hat Inc. and Hibernate Authors
*/
package org.hibernate.orm.test.instant;

import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import org.hibernate.annotations.JdbcTypeCode;
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
import org.hibernate.testing.orm.junit.Jpa;
import org.junit.jupiter.api.Test;

import java.time.Instant;
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.time.ZoneOffset;
import java.time.temporal.ChronoUnit;

import static org.hibernate.type.SqlTypes.TIMESTAMP;
import static org.hibernate.type.SqlTypes.TIMESTAMP_WITH_TIMEZONE;
import static org.junit.jupiter.api.Assertions.assertEquals;

@Jpa(annotatedClasses = InstantTest.Instants.class)
public class InstantTest {
@Test
public void test(EntityManagerFactoryScope scope) {
Instant now = Instant.now();
ZoneOffset zone = ZoneOffset.ofHours(1);
scope.getEntityManagerFactory()
.runInTransaction( entityManager -> {
Instants instants = new Instants();
instants.instantInUtc = now;
instants.instantInLocalTimeZone = now;
instants.instantWithTimeZone = now;
instants.localDateTime = LocalDateTime.ofInstant( now, zone );
instants.offsetDateTime = OffsetDateTime.ofInstant( now, zone );
instants.localDateTimeUtc = LocalDateTime.ofInstant( now, ZoneOffset.UTC );
instants.offsetDateTimeUtc = OffsetDateTime.ofInstant( now, ZoneOffset.UTC );
entityManager.persist( instants );
} );
scope.getEntityManagerFactory()
.runInTransaction( entityManager -> {
Instants instants = entityManager.find( Instants.class, 0 );
assertEqualInstants( now, instants.instantInUtc );
assertEqualInstants( now, instants.instantInLocalTimeZone );
assertEqualInstants( now, instants.instantWithTimeZone );
assertEqualInstants( now, instants.offsetDateTime.toInstant() );
assertEqualInstants( now, instants.localDateTime.toInstant( zone ) );
assertEqualInstants( now, instants.offsetDateTimeUtc.toInstant() );
assertEqualInstants( now, instants.localDateTimeUtc.toInstant( ZoneOffset.UTC ) );
} );
}
void assertEqualInstants(Instant x, Instant y) {
assertEquals( x.truncatedTo( ChronoUnit.SECONDS ), y.truncatedTo( ChronoUnit.SECONDS ) );
}
@Entity(name="Instants")
static class Instants {
@Id long id;
Instant instantInUtc;
@JdbcTypeCode(TIMESTAMP) Instant instantInLocalTimeZone;
@JdbcTypeCode(TIMESTAMP_WITH_TIMEZONE) Instant instantWithTimeZone;
LocalDateTime localDateTime;
OffsetDateTime offsetDateTime;
LocalDateTime localDateTimeUtc;
OffsetDateTime offsetDateTimeUtc;
}
}
78 changes: 78 additions & 0 deletions hibernate-core/src/test/java/org/hibernate/orm/test/instant/InstantWithNormalizedTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
/*
* SPDX-License-Identifier: LGPL-2.1-or-later
* Copyright Red Hat Inc. and Hibernate Authors
*/
package org.hibernate.orm.test.instant;

import jakarta.persistence.Entity;
import jakarta.persistence.Id;
import org.hibernate.annotations.JdbcTypeCode;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.cfg.JdbcSettings;
import org.hibernate.dialect.MySQLDialect;
import org.hibernate.testing.orm.junit.EntityManagerFactoryScope;
import org.hibernate.testing.orm.junit.Jpa;
import org.hibernate.testing.orm.junit.Setting;
import org.hibernate.testing.orm.junit.SkipForDialect;
import org.junit.jupiter.api.Test;

import java.time.Instant;
import java.time.LocalDateTime;
import java.time.OffsetDateTime;
import java.time.ZoneOffset;
import java.time.temporal.ChronoUnit;

import static org.hibernate.type.SqlTypes.TIMESTAMP;
import static org.hibernate.type.SqlTypes.TIMESTAMP_WITH_TIMEZONE;
import static org.junit.jupiter.api.Assertions.assertEquals;

@Jpa(annotatedClasses = InstantWithNormalizedTest.Instants.class,
integrationSettings =
{@Setting(name = AvailableSettings.TIMEZONE_DEFAULT_STORAGE, value = "NORMALIZE"),
@Setting(name = JdbcSettings.JDBC_TIME_ZONE, value = "+01:00")})
@SkipForDialect(dialectClass = MySQLDialect.class, reason = "MySQL hangs dropping the table")
public class InstantWithNormalizedTest {
@Test
public void test(EntityManagerFactoryScope scope) {
Instant now = Instant.now();
ZoneOffset zone = ZoneOffset.of("+01:00");// ZoneOffset.ofHours(1);
scope.getEntityManagerFactory()
.runInTransaction( entityManager -> {
Instants instants = new Instants();
instants.instantInUtc = now;
instants.instantInLocalTimeZone = now;
instants.instantWithTimeZone = now;
instants.localDateTime = LocalDateTime.ofInstant( now, zone );
instants.offsetDateTime = OffsetDateTime.ofInstant( now, zone );
instants.localDateTimeUtc = LocalDateTime.ofInstant( now, ZoneOffset.UTC );
instants.offsetDateTimeUtc = OffsetDateTime.ofInstant( now, ZoneOffset.UTC );
entityManager.persist( instants );
} );
scope.getEntityManagerFactory()
.runInTransaction( entityManager -> {
Instants instants = entityManager.find( Instants.class, 0 );
assertEqualInstants( now, instants.instantInUtc );
assertEqualInstants( now, instants.instantInLocalTimeZone );
assertEqualInstants( now, instants.instantWithTimeZone );
assertEqualInstants( now, instants.offsetDateTime.toInstant() );
assertEqualInstants( now, instants.localDateTime.toInstant( zone ) );
assertEqualInstants( now, instants.offsetDateTimeUtc.toInstant() );
assertEqualInstants( now, instants.localDateTimeUtc.toInstant( ZoneOffset.UTC ) );
} );
}
void assertEqualInstants(Instant x, Instant y) {
assertEquals( x.truncatedTo( ChronoUnit.SECONDS ), y.truncatedTo( ChronoUnit.SECONDS ) );
}

@Entity(name="Instants2")
static class Instants {
@Id long id;
Instant instantInUtc;
@JdbcTypeCode(TIMESTAMP) Instant instantInLocalTimeZone;
@JdbcTypeCode(TIMESTAMP_WITH_TIMEZONE) Instant instantWithTimeZone;
LocalDateTime localDateTime;
OffsetDateTime offsetDateTime;
LocalDateTime localDateTimeUtc;
OffsetDateTime offsetDateTimeUtc;
}
}
Loading