Skip to content

Commit 079c5a9

Browse files
committed
Adopt test to Spring Framework 6 changes.
See #4054
1 parent 3f6821f commit 079c5a9

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/config/MappingMongoConverterParserIntegrationTests.java

+10-11
Original file line numberDiff line numberDiff line change
@@ -51,18 +51,18 @@
5151
*/
5252
public class MappingMongoConverterParserIntegrationTests {
5353

54-
DefaultListableBeanFactory factory;
54+
private DefaultListableBeanFactory factory;
5555

5656
@Test // DATAMONGO-243
57-
public void allowsDbFactoryRefAttribute() {
57+
void allowsDbFactoryRefAttribute() {
5858

5959
loadValidConfiguration();
6060
factory.getBeanDefinition("converter");
6161
factory.getBean("converter");
6262
}
6363

6464
@Test // DATAMONGO-725
65-
public void hasCustomTypeMapper() {
65+
void hasCustomTypeMapper() {
6666

6767
loadValidConfiguration();
6868
MappingMongoConverter converter = factory.getBean("converter", MappingMongoConverter.class);
@@ -72,7 +72,7 @@ public void hasCustomTypeMapper() {
7272
}
7373

7474
@Test // DATAMONGO-301
75-
public void scansForConverterAndSetsUpCustomConversionsAccordingly() {
75+
void scansForConverterAndSetsUpCustomConversionsAccordingly() {
7676

7777
loadValidConfiguration();
7878
CustomConversions conversions = factory.getBean(CustomConversions.class);
@@ -81,7 +81,7 @@ public void scansForConverterAndSetsUpCustomConversionsAccordingly() {
8181
}
8282

8383
@Test // DATAMONGO-607
84-
public void activatesAbbreviatingPropertiesCorrectly() {
84+
void activatesAbbreviatingPropertiesCorrectly() {
8585

8686
loadValidConfiguration();
8787
BeanDefinition definition = factory.getBeanDefinition("abbreviatingConverter.mongoMappingContext");
@@ -93,7 +93,7 @@ public void activatesAbbreviatingPropertiesCorrectly() {
9393
}
9494

9595
@Test // DATAMONGO-866
96-
public void rejectsInvalidFieldNamingStrategyConfiguration() {
96+
void rejectsInvalidFieldNamingStrategyConfiguration() {
9797

9898
BeanDefinitionRegistry factory = new DefaultListableBeanFactory();
9999
XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(factory);
@@ -104,20 +104,19 @@ public void rejectsInvalidFieldNamingStrategyConfiguration() {
104104
}
105105

106106
@Test // DATAMONGO-892
107-
public void shouldThrowBeanDefinitionParsingExceptionIfConverterDefinedAsNestedBean() {
107+
void shouldThrowBeanDefinitionParsingExceptionIfConverterDefinedAsNestedBean() {
108108

109-
assertThatExceptionOfType(BeanDefinitionParsingException.class).isThrownBy(this::loadNestedBeanConfiguration)
110-
.withMessageContaining("Mongo Converter must not be defined as nested bean.");
109+
assertThatExceptionOfType(BeanDefinitionParsingException.class).isThrownBy(this::loadNestedBeanConfiguration);
111110

112111
}
113112

114113
@Test // DATAMONGO-925, DATAMONGO-928
115-
public void shouldSupportCustomFieldNamingStrategy() {
114+
void shouldSupportCustomFieldNamingStrategy() {
116115
assertStrategyReferenceSetFor("mappingConverterWithCustomFieldNamingStrategy");
117116
}
118117

119118
@Test // DATAMONGO-925, DATAMONGO-928
120-
public void shouldNotFailLoadingConfigIfAbbreviationIsDisabledAndStrategySet() {
119+
void shouldNotFailLoadingConfigIfAbbreviationIsDisabledAndStrategySet() {
121120
assertStrategyReferenceSetFor("mappingConverterWithCustomFieldNamingStrategyAndAbbreviationDisabled");
122121
}
123122

0 commit comments

Comments
 (0)