Skip to content

Commit a30fe9d

Browse files
committed
Update ServerPropertiesTests to tolerate changes in Tomcat 8.5.11
Closes gh-7360
1 parent b71baf2 commit a30fe9d

File tree

1 file changed

+40
-12
lines changed

1 file changed

+40
-12
lines changed

spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java

Lines changed: 40 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -496,38 +496,59 @@ public void customTomcatAcceptCount() {
496496
Map<String, String> map = new HashMap<String, String>();
497497
map.put("server.tomcat.accept-count", "10");
498498
bindProperties(map);
499-
TomcatEmbeddedServletContainerFactory container = new TomcatEmbeddedServletContainerFactory();
499+
TomcatEmbeddedServletContainerFactory container = new TomcatEmbeddedServletContainerFactory(
500+
0);
500501
this.properties.customize(container);
501502
TomcatEmbeddedServletContainer embeddedContainer = (TomcatEmbeddedServletContainer) container
502503
.getEmbeddedServletContainer();
503-
assertThat(((AbstractProtocol<?>) embeddedContainer.getTomcat().getConnector()
504-
.getProtocolHandler()).getBacklog()).isEqualTo(10);
504+
embeddedContainer.start();
505+
try {
506+
assertThat(((AbstractProtocol<?>) embeddedContainer.getTomcat().getConnector()
507+
.getProtocolHandler()).getBacklog()).isEqualTo(10);
508+
}
509+
finally {
510+
embeddedContainer.stop();
511+
}
505512
}
506513

507514
@Test
508515
public void customTomcatMaxConnections() {
509516
Map<String, String> map = new HashMap<String, String>();
510517
map.put("server.tomcat.max-connections", "5");
511518
bindProperties(map);
512-
TomcatEmbeddedServletContainerFactory container = new TomcatEmbeddedServletContainerFactory();
519+
TomcatEmbeddedServletContainerFactory container = new TomcatEmbeddedServletContainerFactory(
520+
0);
513521
this.properties.customize(container);
514522
TomcatEmbeddedServletContainer embeddedContainer = (TomcatEmbeddedServletContainer) container
515523
.getEmbeddedServletContainer();
516-
assertThat(((AbstractProtocol<?>) embeddedContainer.getTomcat().getConnector()
517-
.getProtocolHandler()).getMaxConnections()).isEqualTo(5);
524+
embeddedContainer.start();
525+
try {
526+
assertThat(((AbstractProtocol<?>) embeddedContainer.getTomcat().getConnector()
527+
.getProtocolHandler()).getMaxConnections()).isEqualTo(5);
528+
}
529+
finally {
530+
embeddedContainer.stop();
531+
}
518532
}
519533

520534
@Test
521535
public void customTomcatMaxHttpPostSize() {
522536
Map<String, String> map = new HashMap<String, String>();
523537
map.put("server.tomcat.max-http-post-size", "10000");
524538
bindProperties(map);
525-
TomcatEmbeddedServletContainerFactory container = new TomcatEmbeddedServletContainerFactory();
539+
TomcatEmbeddedServletContainerFactory container = new TomcatEmbeddedServletContainerFactory(
540+
0);
526541
this.properties.customize(container);
527542
TomcatEmbeddedServletContainer embeddedContainer = (TomcatEmbeddedServletContainer) container
528543
.getEmbeddedServletContainer();
529-
assertThat(embeddedContainer.getTomcat().getConnector().getMaxPostSize())
530-
.isEqualTo(10000);
544+
embeddedContainer.start();
545+
try {
546+
assertThat(embeddedContainer.getTomcat().getConnector().getMaxPostSize())
547+
.isEqualTo(10000);
548+
}
549+
finally {
550+
embeddedContainer.stop();
551+
}
531552
}
532553

533554
@Test
@@ -536,12 +557,19 @@ public void customTomcatMaxHttpPostSizeWithDeprecatedProperty() {
536557
Map<String, String> map = new HashMap<String, String>();
537558
map.put("server.max-http-post-size", "2000");
538559
bindProperties(map);
539-
TomcatEmbeddedServletContainerFactory container = new TomcatEmbeddedServletContainerFactory();
560+
TomcatEmbeddedServletContainerFactory container = new TomcatEmbeddedServletContainerFactory(
561+
0);
540562
this.properties.customize(container);
541563
TomcatEmbeddedServletContainer embeddedContainer = (TomcatEmbeddedServletContainer) container
542564
.getEmbeddedServletContainer();
543-
assertThat(embeddedContainer.getTomcat().getConnector().getMaxPostSize())
544-
.isEqualTo(2000);
565+
embeddedContainer.start();
566+
try {
567+
assertThat(embeddedContainer.getTomcat().getConnector().getMaxPostSize())
568+
.isEqualTo(2000);
569+
}
570+
finally {
571+
embeddedContainer.stop();
572+
}
545573
}
546574

547575
@Test

0 commit comments

Comments
 (0)