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

Merge branch '2.0.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2018-04-27 09:33:48 +02:00
parent 59b7c50c3c a4840ed70a
commit 4d0fe5bbe6
7 changed files with 31 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryAutoConfigurationTests.java
View File

@@ -47,7 +47,7 @@ public class ReactiveWebServerFactoryAutoConfigurationTests {
@Test
public void createFromConfigClass() {
this.contextRunner.withUserConfiguration(MockWebServerAutoConfiguration.class,
this.contextRunner.withUserConfiguration(MockWebServerConfiguration.class,
HttpHandlerConfiguration.class).run((context) -> {
assertThat(context.getBeansOfType(ReactiveWebServerFactory.class))
.hasSize(1);
@@ -61,7 +61,7 @@ public class ReactiveWebServerFactoryAutoConfigurationTests {
@Test
public void missingHttpHandler() {
this.contextRunner.withUserConfiguration(MockWebServerAutoConfiguration.class)
this.contextRunner.withUserConfiguration(MockWebServerConfiguration.class)
.run((context) -> assertThat(context.getStartupFailure())
.isInstanceOf(ApplicationContextException.class)
.hasMessageContaining("missing HttpHandler bean"));
@@ -70,7 +70,7 @@ public class ReactiveWebServerFactoryAutoConfigurationTests {
@Test
public void multipleHttpHandler() {
this.contextRunner
.withUserConfiguration(MockWebServerAutoConfiguration.class,
.withUserConfiguration(MockWebServerConfiguration.class,
HttpHandlerConfiguration.class, TooManyHttpHandlers.class)
.run((context) -> assertThat(context.getStartupFailure())
.isInstanceOf(ApplicationContextException.class)
@@ -80,7 +80,7 @@ public class ReactiveWebServerFactoryAutoConfigurationTests {
@Test
public void customizeReactiveWebServer() {
this.contextRunner.withUserConfiguration(MockWebServerAutoConfiguration.class,
this.contextRunner.withUserConfiguration(MockWebServerConfiguration.class,
HttpHandlerConfiguration.class, ReactiveWebServerCustomization.class)
.run((context) -> assertThat(
context.getBean(MockReactiveWebServerFactory.class).getPort())
@@ -128,7 +128,7 @@ public class ReactiveWebServerFactoryAutoConfigurationTests {
}
@Configuration
public static class MockWebServerAutoConfiguration {
public static class MockWebServerConfiguration {
@Bean
public MockReactiveWebServerFactory mockReactiveWebServerFactory() {