From edf30b73d603e5a7903c4aba08501876017bbc8b Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Sat, 14 Jan 2017 22:08:34 +0100 Subject: [PATCH] Made tests pass in parallel --- .../src/main/resources/application.properties | 1 + .../com/example/WiremockForDocsClassRuleTests.java | 13 ++++++------- .../WiremockHttpsServerApplicationTests.java | 3 ++- ...nerSpringCloudEurekaAutoConfigurationSpec.groovy | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/samples/wiremock-jetty/src/main/resources/application.properties b/samples/wiremock-jetty/src/main/resources/application.properties index e69de29bb2..1c421cf2b7 100644 --- a/samples/wiremock-jetty/src/main/resources/application.properties +++ b/samples/wiremock-jetty/src/main/resources/application.properties @@ -0,0 +1 @@ +server.port=0 \ No newline at end of file diff --git a/samples/wiremock-jetty/src/test/java/com/example/WiremockForDocsClassRuleTests.java b/samples/wiremock-jetty/src/test/java/com/example/WiremockForDocsClassRuleTests.java index 8bc790dffa..94aff4b974 100644 --- a/samples/wiremock-jetty/src/test/java/com/example/WiremockForDocsClassRuleTests.java +++ b/samples/wiremock-jetty/src/test/java/com/example/WiremockForDocsClassRuleTests.java @@ -1,5 +1,10 @@ package com.example; +import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; +import static com.github.tomakehurst.wiremock.client.WireMock.get; +import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; +import static org.assertj.core.api.Assertions.assertThat; + import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; @@ -7,7 +12,6 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.cloud.contract.wiremock.AutoConfigureWireMock; import org.springframework.cloud.contract.wiremock.WireMockSpring; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ActiveProfiles; @@ -15,20 +19,15 @@ import org.springframework.test.context.junit4.SpringRunner; import com.github.tomakehurst.wiremock.junit.WireMockClassRule; -import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; -import static com.github.tomakehurst.wiremock.client.WireMock.get; -import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; -import static org.assertj.core.api.Assertions.assertThat; - @ActiveProfiles("classrule") @DirtiesContext //tag::wiremock_test1[] @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) -@AutoConfigureWireMock public class WiremockForDocsClassRuleTests { // Start WireMock on some dynamic port + // for some reason `dynamicPort()` is not working properly @ClassRule public static WireMockClassRule wiremock = new WireMockClassRule( WireMockSpring.options().dynamicPort()); diff --git a/samples/wiremock-undertow-ssl/src/test/java/com/example/WiremockHttpsServerApplicationTests.java b/samples/wiremock-undertow-ssl/src/test/java/com/example/WiremockHttpsServerApplicationTests.java index c223a04abe..4bd913d950 100644 --- a/samples/wiremock-undertow-ssl/src/test/java/com/example/WiremockHttpsServerApplicationTests.java +++ b/samples/wiremock-undertow-ssl/src/test/java/com/example/WiremockHttpsServerApplicationTests.java @@ -15,6 +15,7 @@ import org.springframework.cloud.contract.wiremock.WireMockSpring; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.util.SocketUtils; import com.github.tomakehurst.wiremock.junit.WireMockClassRule; @@ -27,7 +28,7 @@ public class WiremockHttpsServerApplicationTests { @ClassRule public static WireMockClassRule wiremock = new WireMockClassRule( - WireMockSpring.options().httpsPort(7443)); + WireMockSpring.options().httpsPort(7443).port(SocketUtils.findAvailableTcpPort())); @Autowired private Service service; diff --git a/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/eureka/StubRunnerSpringCloudEurekaAutoConfigurationSpec.groovy b/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/eureka/StubRunnerSpringCloudEurekaAutoConfigurationSpec.groovy index f6d082651b..7328f59828 100644 --- a/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/eureka/StubRunnerSpringCloudEurekaAutoConfigurationSpec.groovy +++ b/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/eureka/StubRunnerSpringCloudEurekaAutoConfigurationSpec.groovy @@ -79,7 +79,7 @@ class StubRunnerSpringCloudEurekaAutoConfigurationSpec extends Specification { System.clearProperty("stubrunner.stubs.classifier") } - PollingConditions conditions = new PollingConditions(timeout: 40, delay: 1) + PollingConditions conditions = new PollingConditions(timeout: 240, delay: 1) def 'should make service discovery work'() { expect: 'WireMocks are running'