Skip to content

Commit 6582afe

Browse files
committed
Polish
1 parent e834b25 commit 6582afe

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/DefaultServletWebServerFactoryCustomizerTests.java

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
import org.springframework.boot.context.properties.source.MapConfigurationPropertySource;
4747
import org.springframework.boot.web.embedded.jetty.JettyServletWebServerFactory;
4848
import org.springframework.boot.web.embedded.jetty.JettyWebServer;
49-
import org.springframework.boot.web.embedded.tomcat.TomcatContextCustomizer;
5049
import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
5150
import org.springframework.boot.web.embedded.tomcat.TomcatWebServer;
5251
import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory;
@@ -160,11 +159,9 @@ public void redirectContextRootCanBeConfigured() {
160159
assertThat(tomcat.getRedirectContextRoot()).isEqualTo(false);
161160
TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory();
162161
this.customizer.customize(factory);
163-
Context context = mock(Context.class);
164-
for (TomcatContextCustomizer customizer : factory.getTomcatContextCustomizers()) {
165-
customizer.customize(context);
166-
}
167-
verify(context).setMapperContextRootRedirectEnabled(false);
162+
Context context = (Context) ((TomcatWebServer) factory.getWebServer()).getTomcat()
163+
.getHost().findChildren()[0];
164+
assertThat(context.getMapperContextRootRedirectEnabled()).isFalse();
168165
}
169166

170167
@Test
@@ -176,11 +173,9 @@ public void useRelativeRedirectsCanBeConfigured() {
176173
assertThat(tomcat.getUseRelativeRedirects()).isTrue();
177174
TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory();
178175
this.customizer.customize(factory);
179-
Context context = mock(Context.class);
180-
for (TomcatContextCustomizer customizer : factory.getTomcatContextCustomizers()) {
181-
customizer.customize(context);
182-
}
183-
verify(context).setUseRelativeRedirects(true);
176+
Context context = (Context) ((TomcatWebServer) factory.getWebServer()).getTomcat()
177+
.getHost().findChildren()[0];
178+
assertThat(context.getUseRelativeRedirects()).isTrue();
184179
}
185180

186181
@Test

0 commit comments

Comments
 (0)