Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.3.x'

Browse Source
This commit is contained in:
Sam Brannen
2022-07-13 16:36:01 +02:00
parent 8242897c81 bd3499671c
commit 0fb9de5d0e
19 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-test/src/test/java/org/springframework/test/context/junit/jupiter/AutowiredConfigurationErrorsIntegrationTests.java
View File

@@ -72,7 +72,7 @@ class AutowiredConfigurationErrorsIntegrationTests {
AutowiredRepeatedTestMethod.class,
AutowiredParameterizedTestMethod.class
})
void autowiredTestMethodsTestTemplateMethodsAndLifecyleMethods(Class<?> testClass) {
void autowiredTestMethodsTestTemplateMethodsAndLifecycleMethods(Class<?> testClass) {
testEventsFor(testClass)
.assertStatistics(stats -> stats.started(1).succeeded(0).failed(1))
.assertThatEvents().haveExactly(1,
@@ -111,7 +111,7 @@ class AutowiredConfigurationErrorsIntegrationTests {
NonStaticAutowiredBeforeAllMethod.class,
NonStaticAutowiredAfterAllMethod.class
})
void autowiredNonStaticClassLevelLifecyleMethods(Class<?> testClass) {
void autowiredNonStaticClassLevelLifecycleMethods(Class<?> testClass) {
containerEventsFor(testClass)
.assertStatistics(stats -> stats.started(2).succeeded(1).failed(1))
.assertThatEvents().haveExactly(1,

2
spring-test/src/test/java/org/springframework/test/context/support/ActiveProfilesUtilsTests.java
View File

@@ -168,7 +168,7 @@ class ActiveProfilesUtilsTests extends AbstractContextConfigurationUtilsTests {
* @since 4.0
*/
@Test
void resolveActiveProfilesWithOverridenInheritedResolver() {
void resolveActiveProfilesWithOverriddenInheritedResolver() {
assertResolvedProfiles(OverriddenInheritedFooActiveProfilesResolverTestCase.class, "bar");
}

4
spring-test/src/test/java/org/springframework/test/context/support/DirtiesContextTestExecutionListenerTests.java
View File

@@ -249,7 +249,7 @@ class DirtiesContextTestExecutionListenerTests {
@Test
void declaredViaMetaAnnotationWithOverriddenAttributes() throws Exception {
assertAfterClass(DirtiesContextViaMetaAnnotationWithOverridenAttributes.class);
assertAfterClass(DirtiesContextViaMetaAnnotationWithOverriddenAttributes.class);
}
}
@@ -447,7 +447,7 @@ class DirtiesContextTestExecutionListenerTests {
}
@MetaDirtyWithOverrides(classMode = AFTER_CLASS, hierarchyMode = EXHAUSTIVE)
static class DirtiesContextViaMetaAnnotationWithOverridenAttributes {
static class DirtiesContextViaMetaAnnotationWithOverriddenAttributes {
void test() {
}

6
spring-test/src/test/java/org/springframework/test/web/reactive/server/DefaultControllerSpecTests.java
View File

@@ -75,7 +75,7 @@ public class DefaultControllerSpecTests {
@Test
public void configurerConsumers() {
TestConsumer<ArgumentResolverConfigurer> argumentResolverConsumer = new TestConsumer<>();
TestConsumer<RequestedContentTypeResolverBuilder> contenTypeResolverConsumer = new TestConsumer<>();
TestConsumer<RequestedContentTypeResolverBuilder> contentTypeResolverConsumer = new TestConsumer<>();
TestConsumer<CorsRegistry> corsRegistryConsumer = new TestConsumer<>();
TestConsumer<FormatterRegistry> formatterConsumer = new TestConsumer<>();
TestConsumer<ServerCodecConfigurer> codecsConsumer = new TestConsumer<>();
@@ -84,7 +84,7 @@ public class DefaultControllerSpecTests {
new DefaultControllerSpec(new MyController())
.argumentResolvers(argumentResolverConsumer)
.contentTypeResolver(contenTypeResolverConsumer)
.contentTypeResolver(contentTypeResolverConsumer)
.corsMappings(corsRegistryConsumer)
.formatters(formatterConsumer)
.httpMessageCodecs(codecsConsumer)
@@ -93,7 +93,7 @@ public class DefaultControllerSpecTests {
.build();
assertThat(argumentResolverConsumer.getValue()).isNotNull();
assertThat(contenTypeResolverConsumer.getValue()).isNotNull();
assertThat(contentTypeResolverConsumer.getValue()).isNotNull();
assertThat(corsRegistryConsumer.getValue()).isNotNull();
assertThat(formatterConsumer.getValue()).isNotNull();
assertThat(codecsConsumer.getValue()).isNotNull();