Merge pull request #36802 from yrodiere/fix-orm-5.6-timezone

Fix assertions in Hibernate ORM 5.6 compatibility tests
quarkusio · Oct 31, 2023 · 72e99a3 · 72e99a3
2 parents e6423a4 + bedb7b1
commit 72e99a3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/...lity-5.6/database-generator/src/main/java/io/quarkus/it/hibernate/compatibility/Main.java b/...lity-5.6/database-generator/src/main/java/io/quarkus/it/hibernate/compatibility/Main.java
@@ -72,7 +72,7 @@ public int run(String... args) {
                 checkEqual(createdEntity.duration, loadedEntity.duration);
                 checkEqual(createdEntity.uuid, loadedEntity.uuid);
                 checkEqual(createdEntity.instant, loadedEntity.instant);
-                checkEqual(createdEntity.offsetTime.withOffsetSameInstant(ZoneId.systemDefault().getRules().getOffset(Instant.now())),
+                checkEqual(createdEntity.offsetTime.toLocalTime().atOffset(ZoneId.systemDefault().getRules().getOffset(Instant.now())),
                         loadedEntity.offsetTime);
                 checkEqual(createdEntity.offsetDateTime.atZoneSameInstant(ZoneId.systemDefault()).toOffsetDateTime(),
                         loadedEntity.offsetDateTime);

diff --git a/...ty-5.6/mariadb/src/test/java/io/quarkus/it/hibernate/compatibility/CompatibilityTest.java b/...ty-5.6/mariadb/src/test/java/io/quarkus/it/hibernate/compatibility/CompatibilityTest.java
@@ -120,9 +120,8 @@ public void instant() {
     public void offsetTime() {
         assertThat(findOld().offsetTime)
                 .isEqualTo(LocalTime.of(12, 58, 30, 0)
-                        .atOffset(ZoneOffset.ofHours(2))
                         // Hibernate ORM 5 used to normalize these values to the JVM TZ
-                        .withOffsetSameInstant(ZoneId.systemDefault().getRules().getOffset(Instant.now())));
+                        .atOffset(ZoneId.systemDefault().getRules().getOffset(Instant.now())));
     }
 
     // https://github.com/hibernate/hibernate-orm/blob/6.2/migration-guide.adoc#timezone-and-offset-storage

diff --git a/...5.6/postgresql/src/test/java/io/quarkus/it/hibernate/compatibility/CompatibilityTest.java b/...5.6/postgresql/src/test/java/io/quarkus/it/hibernate/compatibility/CompatibilityTest.java
@@ -120,9 +120,8 @@ public void instant() {
     public void offsetTime() {
         assertThat(findOld().offsetTime)
                 .isEqualTo(LocalTime.of(12, 58, 30, 0)
-                        .atOffset(ZoneOffset.ofHours(2))
                         // Hibernate ORM 5 used to normalize these values to the JVM TZ
-                        .withOffsetSameInstant(ZoneId.systemDefault().getRules().getOffset(Instant.now())));
+                        .atOffset(ZoneId.systemDefault().getRules().getOffset(Instant.now())));
     }
 
     // https://github.com/hibernate/hibernate-orm/blob/6.2/migration-guide.adoc#timezone-and-offset-storage