From 5e9b57cf40e9dee9563f7023fec95442a5343891 Mon Sep 17 00:00:00 2001
From: Gavin <gavin@hibernate.org>
Date: Wed, 7 Dec 2022 17:00:09 +0100
Subject: [PATCH] add one more test, this time for
 TIMEZONE_DEFAULT_STORAGE=NORMALIZE

---
 .../orm/test/timezones/PassThruZonedTest.java | 60 +++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 hibernate-core/src/test/java/org/hibernate/orm/test/timezones/PassThruZonedTest.java

diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/PassThruZonedTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/PassThruZonedTest.java
new file mode 100644
index 0000000000..0947b22a7b
--- /dev/null
+++ b/hibernate-core/src/test/java/org/hibernate/orm/test/timezones/PassThruZonedTest.java
@@ -0,0 +1,60 @@
+package org.hibernate.orm.test.timezones;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
+import org.hibernate.cfg.AvailableSettings;
+import org.hibernate.dialect.SybaseDialect;
+import org.hibernate.testing.orm.junit.DomainModel;
+import org.hibernate.testing.orm.junit.ServiceRegistry;
+import org.hibernate.testing.orm.junit.SessionFactory;
+import org.hibernate.testing.orm.junit.SessionFactoryScope;
+import org.hibernate.testing.orm.junit.Setting;
+import org.junit.jupiter.api.Test;
+
+import java.time.OffsetDateTime;
+import java.time.ZoneId;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@DomainModel(annotatedClasses = PassThruZonedTest.Zoned.class)
+@SessionFactory
+@ServiceRegistry(settings = @Setting(name = AvailableSettings.TIMEZONE_DEFAULT_STORAGE, value = "NORMALIZE"))
+public class PassThruZonedTest {
+
+	@Test void test(SessionFactoryScope scope) {
+		ZonedDateTime nowZoned = ZonedDateTime.now().withZoneSameInstant( ZoneId.of("CET") );
+		OffsetDateTime nowOffset = OffsetDateTime.now().withOffsetSameInstant( ZoneOffset.ofHours(3) );
+		long id = scope.fromTransaction( s-> {
+			Zoned z = new Zoned();
+			z.zonedDateTime = nowZoned;
+			z.offsetDateTime = nowOffset;
+			s.persist(z);
+			return z.id;
+		});
+		scope.inSession( s-> {
+			Zoned z = s.find(Zoned.class, id);
+			if ( scope.getSessionFactory().getJdbcServices().getDialect() instanceof SybaseDialect) {
+				// Sybase with jTDS driver has 1/300th sec precision
+				assertEquals( nowZoned.toInstant().toEpochMilli()/30, z.zonedDateTime.toInstant().toEpochMilli()/30 );
+				assertEquals( nowOffset.toInstant().toEpochMilli()/30, z.offsetDateTime.toInstant().toEpochMilli()/30 );
+			}
+			else {
+				assertEquals( nowZoned.toInstant(), z.zonedDateTime.toInstant() );
+				assertEquals( nowOffset.toInstant(), z.offsetDateTime.toInstant() );
+			}
+			assertEquals( ZoneId.systemDefault(), z.zonedDateTime.getZone() );
+			assertEquals( ZoneOffset.systemDefault().normalized(), z.offsetDateTime.getOffset().normalized() );
+		});
+	}
+
+	@Entity
+	public static class Zoned {
+		@Id
+		@GeneratedValue Long id;
+		ZonedDateTime zonedDateTime;
+		OffsetDateTime offsetDateTime;
+	}
+}