Merge branch '2.7.x' into 3.0.x

Closes gh-34017
This commit is contained in:
Moritz Halbritter 2023-01-31 10:50:30 +01:00
commit 0a080736d8
7 changed files with 8 additions and 8 deletions

View File

@ -44,7 +44,7 @@ class DependencyVersionTests {
} }
@Test @Test
void parseWhe5ComponentsShouldReturnNumericQualifierDependencyVersion() { void parseWhen5ComponentsShouldReturnNumericQualifierDependencyVersion() {
assertThat(DependencyVersion.parse("1.2.3.4.5")).isInstanceOf(MultipleComponentsDependencyVersion.class); assertThat(DependencyVersion.parse("1.2.3.4.5")).isInstanceOf(MultipleComponentsDependencyVersion.class);
} }

View File

@ -49,7 +49,7 @@ class AbstractReactiveHealthIndicatorTests {
} }
@Test @Test
void healthCheckWhenDownWithExceptionThrownDoesNotLogHealthCheckFailedMessage(CapturedOutput output) { void healthCheckWhenDownWithExceptionThrownLogsHealthCheckFailedMessage(CapturedOutput output) {
Health health = new AbstractReactiveHealthIndicator("Test message") { Health health = new AbstractReactiveHealthIndicator("Test message") {
@Override @Override
protected Mono<Health> doHealthCheck(Builder builder) { protected Mono<Health> doHealthCheck(Builder builder) {
@ -62,7 +62,7 @@ class AbstractReactiveHealthIndicatorTests {
} }
@Test @Test
void healthCheckWhenDownWithExceptionConfiguredDoesNotLogHealthCheckFailedMessage(CapturedOutput output) { void healthCheckWhenDownWithExceptionConfiguredLogsHealthCheckFailedMessage(CapturedOutput output) {
Health health = new AbstractReactiveHealthIndicator("Test message") { Health health = new AbstractReactiveHealthIndicator("Test message") {
@Override @Override
protected Mono<Health> doHealthCheck(Builder builder) { protected Mono<Health> doHealthCheck(Builder builder) {

View File

@ -22,7 +22,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.UseMainMethod; import org.springframework.boot.test.context.SpringBootTest.UseMainMethod;
@SpringBootTest(useMainMethod = UseMainMethod.ALWAYS) @SpringBootTest(useMainMethod = UseMainMethod.ALWAYS)
public class MyApplicationTests { class MyApplicationTests {
@Test @Test
void exampleTest() { void exampleTest() {

View File

@ -21,7 +21,7 @@ import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.boot.test.web.server.LocalServerPort;
@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
public class MyWebIntegrationTests { class MyWebIntegrationTests {
@LocalServerPort @LocalServerPort
int port; int port;

View File

@ -25,7 +25,7 @@ import org.springframework.context.ConfigurableApplicationContext;
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Phillip Webb * @author Phillip Webb
*/ */
public class ApplicationContextRunnerTests extends class ApplicationContextRunnerTests extends
AbstractApplicationContextRunnerTests<ApplicationContextRunner, ConfigurableApplicationContext, AssertableApplicationContext> { AbstractApplicationContextRunnerTests<ApplicationContextRunner, ConfigurableApplicationContext, AssertableApplicationContext> {
@Override @Override

View File

@ -25,7 +25,7 @@ import org.springframework.boot.web.reactive.context.ConfigurableReactiveWebAppl
* @author Stephane Nicoll * @author Stephane Nicoll
* @author Phillip Webb * @author Phillip Webb
*/ */
public class ReactiveWebApplicationContextRunnerTests extends class ReactiveWebApplicationContextRunnerTests extends
AbstractApplicationContextRunnerTests<ReactiveWebApplicationContextRunner, ConfigurableReactiveWebApplicationContext, AssertableReactiveWebApplicationContext> { AbstractApplicationContextRunnerTests<ReactiveWebApplicationContextRunner, ConfigurableReactiveWebApplicationContext, AssertableReactiveWebApplicationContext> {
@Override @Override

View File

@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.contentOf;
* @author Scott Frederick * @author Scott Frederick
*/ */
@ExtendWith(MavenBuildExtension.class) @ExtendWith(MavenBuildExtension.class)
public class AotTests { class AotTests {
@TestTemplate @TestTemplate
void whenAotRunsSourcesAreGenerated(MavenBuild mavenBuild) { void whenAotRunsSourcesAreGenerated(MavenBuild mavenBuild) {