From b01c1d36aec2d5364853fcfd290a67117ce2650b Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 25 Jun 2014 16:40:20 -0700 Subject: [PATCH] Attempt to fix Windows CI --- .../AbstractEmbeddedServletContainerFactoryTests.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java index 9a5a6162a7a..6f836a28763 100644 --- a/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java +++ b/spring-boot/src/test/java/org/springframework/boot/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java @@ -109,10 +109,12 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests { this.container = factory .getEmbeddedServletContainer(exampleServletRegistration()); this.container.start(); + int port = this.container.getPort(); this.container.stop(); this.thrown.expect(IOException.class); - String response = getResponse(getLocalUrl("/hello")); - throw new RuntimeException(this.container.getPort() + " " + response); + String response = getResponse(getLocalUrl(port, "/hello")); + throw new RuntimeException("Unexpected response on port " + port + " : " + + response); } @Test @@ -302,6 +304,10 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests { return "http://localhost:" + this.container.getPort() + resourcePath; } + protected String getLocalUrl(int port, String resourcePath) { + return "http://localhost:" + port + resourcePath; + } + protected String getResponse(String url) throws IOException, URISyntaxException { ClientHttpResponse response = getClientResponse(url); try {