Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-07-05 00:56:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Tune expected exceptions to support more platforms

Browse Source 
It appears that some machines break when looking for ConnectionException,
but not SocketException, both of which are IOExceptions. This seems to make
tests pass on more machines without compromising the intentions of the API.

[BS-162]
This commit is contained in:
Greg Turnquist 2013-06-17 16:44:28 -04:00 committed by Phillip Webb
parent 19c2a076c2
commit 9ab2f98df0
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java
View File

@ -16,7 +16,7 @@
package org.springframework.bootstrap.actuate.autoconfigure;
import java.io.FileNotFoundException;
import java.net.ConnectException;
import java.net.SocketException;
import java.net.URI;
import java.nio.charset.Charset;
@ -49,6 +49,7 @@ import static org.junit.Assert.assertThat;
* Tests for {@link EndpointWebMvcAutoConfiguration}.
*
* @author Phillip Webb
* @author Greg Turnquist
*/
public class EndpointWebMvcAutoConfigurationTests {
@ -170,7 +171,7 @@ public class EndpointWebMvcAutoConfigurationTests {
}
} catch (Exception ex) {
if (expected == null) {
if (ConnectException.class.isInstance(ex)
if (SocketException.class.isInstance(ex)
|| FileNotFoundException.class.isInstance(ex)) {
return;
}

8
spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java
View File

@ -18,7 +18,7 @@ package org.springframework.bootstrap.context.embedded;
import java.io.FileWriter;
import java.io.IOException;
import java.net.ConnectException;
import java.net.SocketException;
import java.net.URI;
import java.net.URISyntaxException;
import java.nio.charset.Charset;
@ -56,6 +56,7 @@ import static org.mockito.Mockito.mock;
* Base for testing classes that extends {@link AbstractEmbeddedServletContainerFactory}.
*
* @author Phillip Webb
* @author Greg Turnquist
*/
public abstract class AbstractEmbeddedServletContainerFactoryTests {
@ -91,8 +92,7 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
factory.setPort(0);
this.container = factory
.getEmbeddedServletContainer(exampleServletRegistration());
this.thrown.expect(ConnectException.class);
this.thrown.expectMessage("Connection refused");
this.thrown.expect(SocketException.class);
getResponse("http://localhost:8080/hello");
}
@ -102,7 +102,7 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests {
this.container = factory
.getEmbeddedServletContainer(exampleServletRegistration());
this.container.stop();
this.thrown.expect(ConnectException.class);
this.thrown.expect(SocketException.class);
getResponse("http://localhost:8080/hello");
}