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

…tting. Closes: #4446
spring-projects · Jul 13, 2023 · 6968f4b · 6968f4b
1 parent e5b55c2
commit 6968f4b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 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
@@ -2619,7 +2619,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()
@@ -2637,7 +2637,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
@@ -450,7 +450,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
@@ -78,7 +78,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
@@ -74,7 +74,8 @@ public MongoClient mongoClient() {
 		protected void configureConverters(MongoConverterConfigurationAdapter converterConfigurationAdapter) {
 
 			converterConfigurationAdapter
-					.registerPropertyValueConverterFactory(PropertyValueConverterFactory.beanFactoryAware(applicationContext));
+					.registerPropertyValueConverterFactory(PropertyValueConverterFactory.beanFactoryAware(applicationContext))
+					.useNativeDriverJavaTimeCodecs();
 		}
 
 		@Bean