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

Making sure to stop embedded web servers in tests

Browse Source 
Closes gh-9012
This commit is contained in:
Stephane Nicoll
2017-05-03 11:33:42 +02:00
parent d1ea4f8a8a
commit 2b4f2c6aba
4 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/SkipSslVerificationHttpRequestFactoryTests.java
View File

@@ -19,6 +19,7 @@ package org.springframework.boot.actuate.cloudfoundry;
import javax.net.ssl.SSLHandshakeException;
import org.hamcrest.Matcher;
import org.junit.After;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
@@ -44,6 +45,15 @@ public class SkipSslVerificationHttpRequestFactoryTests {
@Rule
public ExpectedException thrown = ExpectedException.none();
private WebServer webServer;
@After
public void shutdownContainer() {
if (this.webServer != null) {
this.webServer.stop();
}
}
@Test
public void restCallToSelfSignedServerShouldNotThrowSslException() throws Exception {
String httpsUrl = getHttpsUrl();
@@ -65,10 +75,10 @@ public class SkipSslVerificationHttpRequestFactoryTests {
private String getHttpsUrl() {
TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory(0);
factory.setSsl(getSsl("password", "classpath:test.jks"));
WebServer webServer = factory.getWebServer(
this.webServer = factory.getWebServer(
new ServletRegistrationBean<>(new ExampleServlet(), "/hello"));
webServer.start();
return "https://localhost:" + webServer.getPort() + "/hello";
this.webServer.start();
return "https://localhost:" + this.webServer.getPort() + "/hello";
}
private Ssl getSsl(String keyPassword, String keyStore) {