Skip to content

S
spring-boot
Commit 6582afea authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Polish

parent e834b25e
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 11 deletions
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/DefaultServletWebServerFactoryCustomizerTests.java
View file @ 6582afea
...@@ -46,7 +46,6 @@ import org.springframework.boot.context.properties.source.ConfigurationPropertyS ...@@ -46,7 +46,6 @@ import org.springframework.boot.context.properties.source.ConfigurationPropertyS
import org.springframework.boot.context.properties.source.MapConfigurationPropertySource; import org.springframework.boot.context.properties.source.MapConfigurationPropertySource;
import org.springframework.boot.web.embedded.jetty.JettyServletWebServerFactory; import org.springframework.boot.web.embedded.jetty.JettyServletWebServerFactory;
import org.springframework.boot.web.embedded.jetty.JettyWebServer; import org.springframework.boot.web.embedded.jetty.JettyWebServer;
import org.springframework.boot.web.embedded.tomcat.TomcatContextCustomizer;
import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory; import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
import org.springframework.boot.web.embedded.tomcat.TomcatWebServer; import org.springframework.boot.web.embedded.tomcat.TomcatWebServer;
import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory; import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory;
...@@ -160,11 +159,9 @@ public class DefaultServletWebServerFactoryCustomizerTests { ...@@ -160,11 +159,9 @@ public class DefaultServletWebServerFactoryCustomizerTests {
assertThat(tomcat.getRedirectContextRoot()).isEqualTo(false); assertThat(tomcat.getRedirectContextRoot()).isEqualTo(false);
TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory(); TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory();
this.customizer.customize(factory); this.customizer.customize(factory);
Context context = mock(Context.class); Context context = (Context) ((TomcatWebServer) factory.getWebServer()).getTomcat()
for (TomcatContextCustomizer customizer : factory.getTomcatContextCustomizers()) { .getHost().findChildren()[0];
customizer.customize(context); assertThat(context.getMapperContextRootRedirectEnabled()).isFalse();
}
verify(context).setMapperContextRootRedirectEnabled(false);
} }
@Test @Test
...@@ -176,11 +173,9 @@ public class DefaultServletWebServerFactoryCustomizerTests { ...@@ -176,11 +173,9 @@ public class DefaultServletWebServerFactoryCustomizerTests {
assertThat(tomcat.getUseRelativeRedirects()).isTrue(); assertThat(tomcat.getUseRelativeRedirects()).isTrue();
TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory(); TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory();
this.customizer.customize(factory); this.customizer.customize(factory);
Context context = mock(Context.class); Context context = (Context) ((TomcatWebServer) factory.getWebServer()).getTomcat()
for (TomcatContextCustomizer customizer : factory.getTomcatContextCustomizers()) { .getHost().findChildren()[0];
customizer.customize(context); assertThat(context.getUseRelativeRedirects()).isTrue();
}
verify(context).setUseRelativeRedirects(true);
} }
@Test @Test
......
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