#1604 wiremock random port (#1605)

* #1604 wiremock random port Signed-off-by: Håvard Ottestad <hmottestad@gmail.com> * remove sout Signed-off-by: Håvard Ottestad <hmottestad@gmail.com>
eclipse-rdf4j · Oct 12, 2019 · b8797d5 · b8797d5
1 parent 100aca7
commit b8797d5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/core/http/client/src/test/java/org/eclipse/rdf4j/http/client/RDF4JProtocolSessionTest.java b/core/http/client/src/test/java/org/eclipse/rdf4j/http/client/RDF4JProtocolSessionTest.java
@@ -20,6 +20,7 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.verify;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import java.util.HashMap;
@@ -36,20 +37,20 @@
 
 /**
  * Unit tests for {@link RDF4JProtocolSession}
- * 
+ *
  * @author Jeen Broekstra
  */
 public class RDF4JProtocolSessionTest {
 
 	@ClassRule
-	public static WireMockRule wireMockRule = new WireMockRule(8089); // No-args constructor defaults to port 8080
+	public static WireMockRule wireMockRule = new WireMockRule(wireMockConfig().dynamicPort());
 
 	private RDF4JProtocolSession subject;
 
 	private String testHeader = "X-testing-header";
 	private String testValue = "foobar";
 
-	private String serverURL = "http://localhost:8089/rdf4j-server";
+	private String serverURL = "http://localhost:" + wireMockRule.port() + "/rdf4j-server";
 	private String repositoryID = "test";
 
 	@Before
@@ -117,7 +118,7 @@ public void testClose() throws Exception {
 				postRequestedFor(urlEqualTo("/rdf4j-server/repositories/test/transactions/1?action=PING")));
 	}
 
-	private void verifyHeader(String path) throws Exception {
+	private void verifyHeader(String path) {
 		verify(anyRequestedFor(urlEqualTo(path)).withHeader(testHeader, containing(testValue)));
 	}
 }
diff --git a/...nager/src/test/java/org/eclipse/rdf4j/repository/manager/RemoteRepositoryManagerTest.java b/...nager/src/test/java/org/eclipse/rdf4j/repository/manager/RemoteRepositoryManagerTest.java
@@ -17,6 +17,7 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.putRequestedFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
 
 import org.eclipse.rdf4j.http.protocol.Protocol;
 import org.eclipse.rdf4j.query.resultio.TupleQueryResultFormat;
@@ -29,24 +30,24 @@
 
 /**
  * Unit tests for {@link RemoteRepositoryManager}
- * 
+ *
  * @author Jeen Broekstra
  *
  */
 public class RemoteRepositoryManagerTest extends RepositoryManagerTest {
 
 	@ClassRule
-	public static WireMockRule wireMockRule = new WireMockRule(8089); // No-args constructor defaults to port 8080
+	public static WireMockRule wireMockRule = new WireMockRule(wireMockConfig().dynamicPort());
 
 	@Override
 	@Before
 	public void setUp() {
-		subject = new RemoteRepositoryManager("http://localhost:8089/rdf4j-server");
+		subject = new RemoteRepositoryManager("http://localhost:" + wireMockRule.port() + "/rdf4j-server");
 		wireMockRule.resetAll();
 	}
 
 	@Test
-	public void testAddRepositoryConfig() throws Exception {
+	public void testAddRepositoryConfig() {
 		wireMockRule.stubFor(get(urlEqualTo("/rdf4j-server/protocol"))
 				.willReturn(aResponse().withStatus(200).withBody(Protocol.VERSION)));
 		wireMockRule
@@ -62,7 +63,7 @@ public void testAddRepositoryConfig() throws Exception {
 	}
 
 	@Test
-	public void testAddRepositoryConfigLegacy() throws Exception {
+	public void testAddRepositoryConfigLegacy() {
 		wireMockRule.stubFor(
 				get(urlEqualTo("/rdf4j-server/protocol")).willReturn(aResponse().withStatus(200).withBody("8")));
 		wireMockRule.stubFor(post(urlPathEqualTo("/rdf4j-server/repositories/SYSTEM/statements"))