Commit dc043266 authored by Andy Wilkinson's avatar Andy Wilkinson

Use ephemeral ports rather than 8080 in our tests

Closes gh-17025
parent 906f7637
...@@ -250,14 +250,14 @@ class ReactiveWebServerFactoryAutoConfigurationTests { ...@@ -250,14 +250,14 @@ class ReactiveWebServerFactoryAutoConfigurationTests {
@Test @Test
void forwardedHeaderTransformerShouldBeConfigured() { void forwardedHeaderTransformerShouldBeConfigured() {
this.contextRunner.withUserConfiguration(HttpHandlerConfiguration.class) this.contextRunner.withUserConfiguration(HttpHandlerConfiguration.class)
.withPropertyValues("server.forward-headers-strategy=framework") .withPropertyValues("server.forward-headers-strategy=framework", "server.port=0")
.run((context) -> assertThat(context).hasSingleBean(ForwardedHeaderTransformer.class)); .run((context) -> assertThat(context).hasSingleBean(ForwardedHeaderTransformer.class));
} }
@Test @Test
void forwardedHeaderTransformerWhenStrategyNotFilterShouldNotBeConfigured() { void forwardedHeaderTransformerWhenStrategyNotFilterShouldNotBeConfigured() {
this.contextRunner.withUserConfiguration(HttpHandlerConfiguration.class) this.contextRunner.withUserConfiguration(HttpHandlerConfiguration.class)
.withPropertyValues("server.forward-headers-strategy=native") .withPropertyValues("server.forward-headers-strategy=native", "server.port=0")
.run((context) -> assertThat(context).doesNotHaveBean(ForwardedHeaderTransformer.class)); .run((context) -> assertThat(context).doesNotHaveBean(ForwardedHeaderTransformer.class));
} }
...@@ -265,7 +265,7 @@ class ReactiveWebServerFactoryAutoConfigurationTests { ...@@ -265,7 +265,7 @@ class ReactiveWebServerFactoryAutoConfigurationTests {
void forwardedHeaderTransformerWhenAlreadyRegisteredShouldBackOff() { void forwardedHeaderTransformerWhenAlreadyRegisteredShouldBackOff() {
this.contextRunner this.contextRunner
.withUserConfiguration(ForwardedHeaderTransformerConfiguration.class, HttpHandlerConfiguration.class) .withUserConfiguration(ForwardedHeaderTransformerConfiguration.class, HttpHandlerConfiguration.class)
.withPropertyValues("server.forward-headers-strategy=framework") .withPropertyValues("server.forward-headers-strategy=framework", "server.port=0")
.run((context) -> assertThat(context).hasSingleBean(ForwardedHeaderTransformer.class)); .run((context) -> assertThat(context).hasSingleBean(ForwardedHeaderTransformer.class));
} }
......
...@@ -155,7 +155,8 @@ class ServletWebServerFactoryAutoConfigurationTests { ...@@ -155,7 +155,8 @@ class ServletWebServerFactoryAutoConfigurationTests {
AnnotationConfigServletWebServerApplicationContext::new) AnnotationConfigServletWebServerApplicationContext::new)
.withClassLoader(new FilteredClassLoader(Tomcat.class, HttpServer.class)) .withClassLoader(new FilteredClassLoader(Tomcat.class, HttpServer.class))
.withConfiguration(AutoConfigurations.of(ServletWebServerFactoryAutoConfiguration.class)) .withConfiguration(AutoConfigurations.of(ServletWebServerFactoryAutoConfiguration.class))
.withUserConfiguration(JettyServerCustomizerConfiguration.class); .withUserConfiguration(JettyServerCustomizerConfiguration.class)
.withPropertyValues("server.port:0");
runner.run((context) -> { runner.run((context) -> {
JettyServletWebServerFactory factory = context.getBean(JettyServletWebServerFactory.class); JettyServletWebServerFactory factory = context.getBean(JettyServletWebServerFactory.class);
assertThat(factory.getServerCustomizers()).hasSize(1); assertThat(factory.getServerCustomizers()).hasSize(1);
...@@ -168,7 +169,8 @@ class ServletWebServerFactoryAutoConfigurationTests { ...@@ -168,7 +169,8 @@ class ServletWebServerFactoryAutoConfigurationTests {
AnnotationConfigServletWebServerApplicationContext::new) AnnotationConfigServletWebServerApplicationContext::new)
.withClassLoader(new FilteredClassLoader(Tomcat.class, HttpServer.class, Server.class)) .withClassLoader(new FilteredClassLoader(Tomcat.class, HttpServer.class, Server.class))
.withConfiguration(AutoConfigurations.of(ServletWebServerFactoryAutoConfiguration.class)) .withConfiguration(AutoConfigurations.of(ServletWebServerFactoryAutoConfiguration.class))
.withUserConfiguration(UndertowDeploymentInfoCustomizerConfiguration.class); .withUserConfiguration(UndertowDeploymentInfoCustomizerConfiguration.class)
.withPropertyValues("server.port:0");
runner.run((context) -> { runner.run((context) -> {
UndertowServletWebServerFactory factory = context.getBean(UndertowServletWebServerFactory.class); UndertowServletWebServerFactory factory = context.getBean(UndertowServletWebServerFactory.class);
assertThat(factory.getDeploymentInfoCustomizers()).hasSize(1); assertThat(factory.getDeploymentInfoCustomizers()).hasSize(1);
...@@ -181,7 +183,8 @@ class ServletWebServerFactoryAutoConfigurationTests { ...@@ -181,7 +183,8 @@ class ServletWebServerFactoryAutoConfigurationTests {
AnnotationConfigServletWebServerApplicationContext::new) AnnotationConfigServletWebServerApplicationContext::new)
.withClassLoader(new FilteredClassLoader(Tomcat.class, HttpServer.class, Server.class)) .withClassLoader(new FilteredClassLoader(Tomcat.class, HttpServer.class, Server.class))
.withConfiguration(AutoConfigurations.of(ServletWebServerFactoryAutoConfiguration.class)) .withConfiguration(AutoConfigurations.of(ServletWebServerFactoryAutoConfiguration.class))
.withUserConfiguration(UndertowBuilderCustomizerConfiguration.class); .withUserConfiguration(UndertowBuilderCustomizerConfiguration.class)
.withPropertyValues("server.port:0");
runner.run((context) -> { runner.run((context) -> {
UndertowServletWebServerFactory factory = context.getBean(UndertowServletWebServerFactory.class); UndertowServletWebServerFactory factory = context.getBean(UndertowServletWebServerFactory.class);
assertThat(factory.getBuilderCustomizers()).hasSize(1); assertThat(factory.getBuilderCustomizers()).hasSize(1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment