Skip to content

Commit 5407456

Browse files
sxhinzvcchristophstrobl
authored andcommitted
Fix test setup so that temporal conversions use symmetric timezone setting.
Closes: #4446 Original Pull Request: #4447
1 parent 31f0aa3 commit 5407456

File tree

4 files changed

+12
-6
lines changed

4 files changed

+12
-6
lines changed

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/MappingMongoConverterUnitTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import java.net.URL;
2626
import java.time.LocalDate;
2727
import java.time.LocalDateTime;
28-
import java.time.ZoneOffset;
2928
import java.time.temporal.ChronoUnit;
3029
import java.util.*;
3130

@@ -106,6 +105,7 @@
106105
* @author Mark Paluch
107106
* @author Roman Puchkovskiy
108107
* @author Heesu Jung
108+
* @author Julia Lee
109109
*/
110110
@ExtendWith(MockitoExtension.class)
111111
class MappingMongoConverterUnitTests {
@@ -2619,7 +2619,7 @@ void readsMapThatDoesNotComeAsDocument() {
26192619
void projectShouldReadSimpleInterfaceProjection() {
26202620

26212621
org.bson.Document source = new org.bson.Document("birthDate",
2622-
Date.from(LocalDate.of(1999, 12, 1).atStartOfDay().toInstant(ZoneOffset.UTC))).append("foo", "Walter");
2622+
Date.from(LocalDate.of(1999, 12, 1).atStartOfDay(systemDefault()).toInstant())).append("foo", "Walter");
26232623

26242624
EntityProjectionIntrospector discoverer = EntityProjectionIntrospector.create(converter.getProjectionFactory(),
26252625
EntityProjectionIntrospector.ProjectionPredicate.typeHierarchy()
@@ -2637,7 +2637,7 @@ void projectShouldReadSimpleInterfaceProjection() {
26372637
void projectShouldReadSimpleDtoProjection() {
26382638

26392639
org.bson.Document source = new org.bson.Document("birthDate",
2640-
Date.from(LocalDate.of(1999, 12, 1).atStartOfDay().toInstant(ZoneOffset.UTC))).append("foo", "Walter");
2640+
Date.from(LocalDate.of(1999, 12, 1).atStartOfDay(systemDefault()).toInstant())).append("foo", "Walter");
26412641

26422642
EntityProjectionIntrospector introspector = EntityProjectionIntrospector.create(converter.getProjectionFactory(),
26432643
EntityProjectionIntrospector.ProjectionPredicate.typeHierarchy()

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/AbstractEncryptionTestBase.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070

7171
/**
7272
* @author Christoph Strobl
73+
* @author Julia Lee
7374
*/
7475
public abstract class AbstractEncryptionTestBase {
7576

@@ -450,7 +451,8 @@ public MongoClient mongoClient() {
450451
protected void configureConverters(MongoConverterConfigurationAdapter converterConfigurationAdapter) {
451452

452453
converterConfigurationAdapter
453-
.registerPropertyValueConverterFactory(PropertyValueConverterFactory.beanFactoryAware(applicationContext));
454+
.registerPropertyValueConverterFactory(PropertyValueConverterFactory.beanFactoryAware(applicationContext))
455+
.useNativeDriverJavaTimeCodecs();
454456
}
455457

456458
@Bean

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/BypassAutoEncryptionTest.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
* Encryption tests for client having {@link AutoEncryptionSettings#isBypassAutoEncryption()}.
4646
*
4747
* @author Christoph Strobl
48+
* @author Julia Lee
4849
*/
4950
@ExtendWith(SpringExtension.class)
5051
@ContextConfiguration(classes = Config.class)
@@ -78,7 +79,8 @@ protected void configureClientSettings(Builder builder) {
7879
protected void configureConverters(MongoConverterConfigurationAdapter converterConfigurationAdapter) {
7980

8081
converterConfigurationAdapter
81-
.registerPropertyValueConverterFactory(PropertyValueConverterFactory.beanFactoryAware(applicationContext));
82+
.registerPropertyValueConverterFactory(PropertyValueConverterFactory.beanFactoryAware(applicationContext))
83+
.useNativeDriverJavaTimeCodecs();
8284
}
8385

8486
@Bean

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/encryption/EncryptionTests.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949

5050
/**
5151
* @author Christoph Strobl
52+
* @author Julia Lee
5253
*/
5354
@ExtendWith(SpringExtension.class)
5455
@ContextConfiguration(classes = Config.class)
@@ -74,7 +75,8 @@ public MongoClient mongoClient() {
7475
protected void configureConverters(MongoConverterConfigurationAdapter converterConfigurationAdapter) {
7576

7677
converterConfigurationAdapter
77-
.registerPropertyValueConverterFactory(PropertyValueConverterFactory.beanFactoryAware(applicationContext));
78+
.registerPropertyValueConverterFactory(PropertyValueConverterFactory.beanFactoryAware(applicationContext))
79+
.useNativeDriverJavaTimeCodecs();
7880
}
7981

8082
@Bean

0 commit comments

Comments
 (0)