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

Stop Jetty in Jetty8JettyEmbeddedServletContainerFactoryTests

Browse Source 
Closes gh-12734
This commit is contained in:
Andy Wilkinson
2018-04-03 15:45:08 +01:00
parent edc00eef24
commit dee8750aff
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
spring-boot/src/test/java/org/springframework/boot/context/embedded/jetty/Jetty8JettyEmbeddedServletContainerFactoryTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012-2017 the original author or authors.
* Copyright 2012-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -70,23 +70,28 @@ public class Jetty8JettyEmbeddedServletContainerFactoryTests {
});
jetty.start();
int port = jetty.getPort();
RestTemplate restTemplate = new RestTemplate();
restTemplate.setErrorHandler(new ResponseErrorHandler() {
try {
int port = jetty.getPort();
RestTemplate restTemplate = new RestTemplate();
restTemplate.setErrorHandler(new ResponseErrorHandler() {
@Override
public boolean hasError(ClientHttpResponse response) throws IOException {
return false;
}
@Override
public boolean hasError(ClientHttpResponse response) throws IOException {
return false;
}
@Override
public void handleError(ClientHttpResponse response) throws IOException {
}
@Override
public void handleError(ClientHttpResponse response) throws IOException {
}
});
ResponseEntity<String> response = restTemplate
.getForEntity("http://localhost:" + port, String.class);
assertThat(response.getBody()).isEqualTo("An error occurred");
});
ResponseEntity<String> response = restTemplate
.getForEntity("http://localhost:" + port, String.class);
assertThat(response.getBody()).isEqualTo("An error occurred");
}
finally {
jetty.stop();
}
}
private static final class TestServlet extends HttpServlet {