Fix test setup so that temporal conversions use symmetric timezone se…

…tting. Closes: #4446 Original Pull Request: #4447
spring-projects · Jul 17, 2023 · 529a0c7 · 529a0c7
1 parent 77a9622
commit 529a0c7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/...st/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java b/...st/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java
@@ -30,7 +30,6 @@
 import java.net.URL;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.ZoneOffset;
 import java.time.temporal.ChronoUnit;
 import java.util.*;
 
@@ -110,6 +109,7 @@
  * @author Mark Paluch
  * @author Roman Puchkovskiy
  * @author Heesu Jung
+ * @author Julia Lee
  */
 @ExtendWith(MockitoExtension.class)
 class MappingMongoConverterUnitTests {
@@ -2623,7 +2623,7 @@ void readsMapThatDoesNotComeAsDocument() {
 	void projectShouldReadSimpleInterfaceProjection() {
 
 		org.bson.Document source = new org.bson.Document("birthDate",
-				Date.from(LocalDate.of(1999, 12, 1).atStartOfDay().toInstant(ZoneOffset.UTC))).append("foo", "Walter");
+				Date.from(LocalDate.of(1999, 12, 1).atStartOfDay(systemDefault()).toInstant())).append("foo", "Walter");
 
 		EntityProjectionIntrospector discoverer = EntityProjectionIntrospector.create(converter.getProjectionFactory(),
 				EntityProjectionIntrospector.ProjectionPredicate.typeHierarchy()
@@ -2641,7 +2641,7 @@ void projectShouldReadSimpleInterfaceProjection() {
 	void projectShouldReadSimpleDtoProjection() {
 
 		org.bson.Document source = new org.bson.Document("birthDate",
-				Date.from(LocalDate.of(1999, 12, 1).atStartOfDay().toInstant(ZoneOffset.UTC))).append("foo", "Walter");
+				Date.from(LocalDate.of(1999, 12, 1).atStartOfDay(systemDefault()).toInstant())).append("foo", "Walter");
 
 		EntityProjectionIntrospector introspector = EntityProjectionIntrospector.create(converter.getProjectionFactory(),
 				EntityProjectionIntrospector.ProjectionPredicate.typeHierarchy()

diff --git a/...est/java/org/springframework/data/mongodb/core/encryption/AbstractEncryptionTestBase.java b/...est/java/org/springframework/data/mongodb/core/encryption/AbstractEncryptionTestBase.java
@@ -70,6 +70,7 @@
 
 /**
  * @author Christoph Strobl
+ * @author Julia Lee
  */
 public abstract class AbstractEncryptionTestBase {
 
@@ -450,7 +451,8 @@ public MongoClient mongoClient() {
 		protected void configureConverters(MongoConverterConfigurationAdapter converterConfigurationAdapter) {
 
 			converterConfigurationAdapter
-					.registerPropertyValueConverterFactory(PropertyValueConverterFactory.beanFactoryAware(applicationContext));
+					.registerPropertyValueConverterFactory(PropertyValueConverterFactory.beanFactoryAware(applicationContext))
+					.useNativeDriverJavaTimeCodecs();
 		}
 
 		@Bean

diff --git a/.../test/java/org/springframework/data/mongodb/core/encryption/BypassAutoEncryptionTest.java b/.../test/java/org/springframework/data/mongodb/core/encryption/BypassAutoEncryptionTest.java
@@ -45,6 +45,7 @@
  * Encryption tests for client having {@link AutoEncryptionSettings#isBypassAutoEncryption()}.
  *
  * @author Christoph Strobl
+ * @author Julia Lee
  */
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = Config.class)
@@ -78,7 +79,8 @@ protected void configureClientSettings(Builder builder) {
 		protected void configureConverters(MongoConverterConfigurationAdapter converterConfigurationAdapter) {
 
 			converterConfigurationAdapter
-					.registerPropertyValueConverterFactory(PropertyValueConverterFactory.beanFactoryAware(applicationContext));
+					.registerPropertyValueConverterFactory(PropertyValueConverterFactory.beanFactoryAware(applicationContext))
+					.useNativeDriverJavaTimeCodecs();
 		}
 
 		@Bean

diff --git a/...ngodb/src/test/java/org/springframework/data/mongodb/core/encryption/EncryptionTests.java b/...ngodb/src/test/java/org/springframework/data/mongodb/core/encryption/EncryptionTests.java
@@ -57,6 +57,7 @@
 
 /**
  * @author Christoph Strobl
+ * @author Julia Lee
  */
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration(classes = Config.class)
@@ -82,7 +83,8 @@ public MongoClient mongoClient() {
 		protected void configureConverters(MongoConverterConfigurationAdapter converterConfigurationAdapter) {
 
 			converterConfigurationAdapter
-					.registerPropertyValueConverterFactory(PropertyValueConverterFactory.beanFactoryAware(applicationContext));
+					.registerPropertyValueConverterFactory(PropertyValueConverterFactory.beanFactoryAware(applicationContext))
+					.useNativeDriverJavaTimeCodecs();
 		}
 
 		@Bean