From 42d82dca232b31b7beb1e446283f44ea9ba4707f Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 14 Nov 2016 10:30:04 +0100 Subject: [PATCH] Prepared code for parallel run --- .../restdocs/http-client/src/main/resources/application.yml | 2 +- .../java/com/example/WiremockImportApplicationTests.java | 4 ++-- .../java/com/example/WiremockServerApplicationTests.java | 4 ++-- .../java/com/example/WiremockServerApplicationTests.java | 4 ++-- .../com/example/WiremockHttpsServerApplicationTests.java | 4 ++-- .../java/com/example/WiremockImportApplicationTests.java | 4 ++-- .../example/WiremockImportContextPathApplicationTests.java | 4 ++-- .../java/com/example/WiremockServerApplicationTests.java | 4 ++-- .../src/main/resources/application.properties | 3 ++- .../com/example/WiremockHttpsServerApplicationTests.java | 4 ++-- .../src/main/resources/application.properties | 1 + .../java/com/example/WiremockImportApplicationTests.java | 4 ++-- .../java/com/example/WiremockServerApplicationTests.java | 4 ++-- .../src/main/resources/application.yml | 2 +- .../src/main/resources/application.yml | 2 +- .../src/main/resources/application.yml | 2 +- .../src/test/resources/application.yml | 4 +++- .../src/test/resources/application.yml | 2 ++ .../src/test/resources/application.yml | 2 ++ .../src/test/resources/application.yml | 4 +++- .../src/test/resources/application.yml | 4 +++- .../src/test/resources/application.yml | 5 ++++- 22 files changed, 44 insertions(+), 29 deletions(-) diff --git a/samples/standalone/restdocs/http-client/src/main/resources/application.yml b/samples/standalone/restdocs/http-client/src/main/resources/application.yml index 0cde20a49d..056c802c77 100644 --- a/samples/standalone/restdocs/http-client/src/main/resources/application.yml +++ b/samples/standalone/restdocs/http-client/src/main/resources/application.yml @@ -1,4 +1,4 @@ -server.port: 8090 +server.port: 8097 logging: level: org.springframework.web.client: debug diff --git a/samples/wiremock-jetty/src/test/java/com/example/WiremockImportApplicationTests.java b/samples/wiremock-jetty/src/test/java/com/example/WiremockImportApplicationTests.java index 665125412b..121f8e2d50 100644 --- a/samples/wiremock-jetty/src/test/java/com/example/WiremockImportApplicationTests.java +++ b/samples/wiremock-jetty/src/test/java/com/example/WiremockImportApplicationTests.java @@ -17,9 +17,9 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) -@SpringBootTest(properties="app.baseUrl=http://localhost:8080", webEnvironment=WebEnvironment.NONE) +@SpringBootTest(properties="app.baseUrl=http://localhost:6060", webEnvironment=WebEnvironment.NONE) @DirtiesContext -@AutoConfigureWireMock +@AutoConfigureWireMock(port = 6060) public class WiremockImportApplicationTests { @Autowired diff --git a/samples/wiremock-jetty/src/test/java/com/example/WiremockServerApplicationTests.java b/samples/wiremock-jetty/src/test/java/com/example/WiremockServerApplicationTests.java index 78dd0574db..6c6f1e6da9 100644 --- a/samples/wiremock-jetty/src/test/java/com/example/WiremockServerApplicationTests.java +++ b/samples/wiremock-jetty/src/test/java/com/example/WiremockServerApplicationTests.java @@ -19,12 +19,12 @@ import org.springframework.test.context.junit4.SpringRunner; import com.github.tomakehurst.wiremock.junit.WireMockClassRule; @RunWith(SpringRunner.class) -@SpringBootTest(properties="app.baseUrl=http://localhost:8080", webEnvironment=WebEnvironment.NONE) +@SpringBootTest(properties="app.baseUrl=http://localhost:6061", webEnvironment=WebEnvironment.NONE) @DirtiesContext public class WiremockServerApplicationTests { @ClassRule - public static WireMockClassRule wiremock = new WireMockClassRule(WireMockSpring.options()); + public static WireMockClassRule wiremock = new WireMockClassRule(WireMockSpring.options().port(6061)); @Autowired private Service service; diff --git a/samples/wiremock-native/src/test/java/com/example/WiremockServerApplicationTests.java b/samples/wiremock-native/src/test/java/com/example/WiremockServerApplicationTests.java index bb2442b802..faef1e5ff2 100644 --- a/samples/wiremock-native/src/test/java/com/example/WiremockServerApplicationTests.java +++ b/samples/wiremock-native/src/test/java/com/example/WiremockServerApplicationTests.java @@ -18,12 +18,12 @@ import org.springframework.test.context.junit4.SpringRunner; import com.github.tomakehurst.wiremock.junit.WireMockClassRule; @RunWith(SpringRunner.class) -@SpringBootTest(properties="app.baseUrl=http://localhost:8080", webEnvironment=WebEnvironment.NONE) +@SpringBootTest(properties="app.baseUrl=http://localhost:6063", webEnvironment=WebEnvironment.NONE) @DirtiesContext public class WiremockServerApplicationTests { @ClassRule - public static WireMockClassRule wiremock = new WireMockClassRule(); + public static WireMockClassRule wiremock = new WireMockClassRule(6063); @Autowired private Service service; diff --git a/samples/wiremock-tomcat/src/test/java/com/example/WiremockHttpsServerApplicationTests.java b/samples/wiremock-tomcat/src/test/java/com/example/WiremockHttpsServerApplicationTests.java index e700ce0211..add1d311fe 100644 --- a/samples/wiremock-tomcat/src/test/java/com/example/WiremockHttpsServerApplicationTests.java +++ b/samples/wiremock-tomcat/src/test/java/com/example/WiremockHttpsServerApplicationTests.java @@ -19,13 +19,13 @@ import com.github.tomakehurst.wiremock.junit.WireMockClassRule; @RunWith(SpringRunner.class) -@SpringBootTest("app.baseUrl=https://localhost:8443") +@SpringBootTest("app.baseUrl=https://localhost:6443") @DirtiesContext public class WiremockHttpsServerApplicationTests { @ClassRule public static WireMockClassRule wiremock = new WireMockClassRule( - WireMockSpring.options().httpsPort(8443)); + WireMockSpring.options().httpsPort(6443)); @Autowired private Service service; diff --git a/samples/wiremock-tomcat/src/test/java/com/example/WiremockImportApplicationTests.java b/samples/wiremock-tomcat/src/test/java/com/example/WiremockImportApplicationTests.java index 665125412b..7169d26908 100644 --- a/samples/wiremock-tomcat/src/test/java/com/example/WiremockImportApplicationTests.java +++ b/samples/wiremock-tomcat/src/test/java/com/example/WiremockImportApplicationTests.java @@ -17,9 +17,9 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) -@SpringBootTest(properties="app.baseUrl=http://localhost:8080", webEnvironment=WebEnvironment.NONE) +@SpringBootTest(properties="app.baseUrl=http://localhost:6065", webEnvironment=WebEnvironment.NONE) @DirtiesContext -@AutoConfigureWireMock +@AutoConfigureWireMock(port = 6065) public class WiremockImportApplicationTests { @Autowired diff --git a/samples/wiremock-tomcat/src/test/java/com/example/WiremockImportContextPathApplicationTests.java b/samples/wiremock-tomcat/src/test/java/com/example/WiremockImportContextPathApplicationTests.java index dadb1b61f4..c46ffe2873 100644 --- a/samples/wiremock-tomcat/src/test/java/com/example/WiremockImportContextPathApplicationTests.java +++ b/samples/wiremock-tomcat/src/test/java/com/example/WiremockImportContextPathApplicationTests.java @@ -16,10 +16,10 @@ import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) -@SpringBootTest(properties = { "app.baseUrl=http://localhost:8080", +@SpringBootTest(properties = { "app.baseUrl=http://localhost:6066", "server.context-path=/app" }, webEnvironment = WebEnvironment.NONE) @DirtiesContext -@AutoConfigureWireMock +@AutoConfigureWireMock(port = 6066) public class WiremockImportContextPathApplicationTests { @Autowired diff --git a/samples/wiremock-tomcat/src/test/java/com/example/WiremockServerApplicationTests.java b/samples/wiremock-tomcat/src/test/java/com/example/WiremockServerApplicationTests.java index 78dd0574db..d7f2980b6f 100644 --- a/samples/wiremock-tomcat/src/test/java/com/example/WiremockServerApplicationTests.java +++ b/samples/wiremock-tomcat/src/test/java/com/example/WiremockServerApplicationTests.java @@ -19,12 +19,12 @@ import org.springframework.test.context.junit4.SpringRunner; import com.github.tomakehurst.wiremock.junit.WireMockClassRule; @RunWith(SpringRunner.class) -@SpringBootTest(properties="app.baseUrl=http://localhost:8080", webEnvironment=WebEnvironment.NONE) +@SpringBootTest(properties="app.baseUrl=http://localhost:6067", webEnvironment=WebEnvironment.NONE) @DirtiesContext public class WiremockServerApplicationTests { @ClassRule - public static WireMockClassRule wiremock = new WireMockClassRule(WireMockSpring.options()); + public static WireMockClassRule wiremock = new WireMockClassRule(WireMockSpring.options().port(6067)); @Autowired private Service service; diff --git a/samples/wiremock-undertow-ssl/src/main/resources/application.properties b/samples/wiremock-undertow-ssl/src/main/resources/application.properties index 3bfa895df9..baf7121779 100644 --- a/samples/wiremock-undertow-ssl/src/main/resources/application.properties +++ b/samples/wiremock-undertow-ssl/src/main/resources/application.properties @@ -1,4 +1,5 @@ #WireMock password - http://wiremock.org/docs/running-standalone/ server.ssl.key-store-password=password server.ssl.key-password=password -server.ssl.trust-store-password=password \ No newline at end of file +server.ssl.trust-store-password=password +server.port=-1 \ No newline at end of file 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 881a4339c6..c223a04abe 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 @@ -20,14 +20,14 @@ import com.github.tomakehurst.wiremock.junit.WireMockClassRule; @RunWith(SpringRunner.class) -@SpringBootTest("app.baseUrl=https://localhost:8443") +@SpringBootTest("app.baseUrl=https://localhost:7443") @DirtiesContext @ActiveProfiles("ssl") public class WiremockHttpsServerApplicationTests { @ClassRule public static WireMockClassRule wiremock = new WireMockClassRule( - WireMockSpring.options().httpsPort(8443)); + WireMockSpring.options().httpsPort(7443)); @Autowired private Service service; diff --git a/samples/wiremock-undertow/src/main/resources/application.properties b/samples/wiremock-undertow/src/main/resources/application.properties index e69de29bb2..1e1d091b4f 100644 --- a/samples/wiremock-undertow/src/main/resources/application.properties +++ b/samples/wiremock-undertow/src/main/resources/application.properties @@ -0,0 +1 @@ +server.port=7070 \ No newline at end of file diff --git a/samples/wiremock-undertow/src/test/java/com/example/WiremockImportApplicationTests.java b/samples/wiremock-undertow/src/test/java/com/example/WiremockImportApplicationTests.java index 665125412b..fd6c29e060 100644 --- a/samples/wiremock-undertow/src/test/java/com/example/WiremockImportApplicationTests.java +++ b/samples/wiremock-undertow/src/test/java/com/example/WiremockImportApplicationTests.java @@ -17,9 +17,9 @@ import org.springframework.test.context.junit4.SpringRunner; @RunWith(SpringRunner.class) -@SpringBootTest(properties="app.baseUrl=http://localhost:8080", webEnvironment=WebEnvironment.NONE) +@SpringBootTest(properties="app.baseUrl=http://localhost:7070", webEnvironment=WebEnvironment.NONE) @DirtiesContext -@AutoConfigureWireMock +@AutoConfigureWireMock(port = 7070) public class WiremockImportApplicationTests { @Autowired diff --git a/samples/wiremock-undertow/src/test/java/com/example/WiremockServerApplicationTests.java b/samples/wiremock-undertow/src/test/java/com/example/WiremockServerApplicationTests.java index 78dd0574db..9fd429e5b1 100644 --- a/samples/wiremock-undertow/src/test/java/com/example/WiremockServerApplicationTests.java +++ b/samples/wiremock-undertow/src/test/java/com/example/WiremockServerApplicationTests.java @@ -19,12 +19,12 @@ import org.springframework.test.context.junit4.SpringRunner; import com.github.tomakehurst.wiremock.junit.WireMockClassRule; @RunWith(SpringRunner.class) -@SpringBootTest(properties="app.baseUrl=http://localhost:8080", webEnvironment=WebEnvironment.NONE) +@SpringBootTest(properties="app.baseUrl=http://localhost:7071", webEnvironment=WebEnvironment.NONE) @DirtiesContext public class WiremockServerApplicationTests { @ClassRule - public static WireMockClassRule wiremock = new WireMockClassRule(WireMockSpring.options()); + public static WireMockClassRule wiremock = new WireMockClassRule(WireMockSpring.options().port(7071)); @Autowired private Service service; diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/loanApplicationService/src/main/resources/application.yml b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/loanApplicationService/src/main/resources/application.yml index e86bbd0e0f..874c96fb5b 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/loanApplicationService/src/main/resources/application.yml +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleJerseyProject/loanApplicationService/src/main/resources/application.yml @@ -1 +1 @@ -server.port=8090 \ No newline at end of file +server.port=8094 \ No newline at end of file diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/loanApplicationService/src/main/resources/application.yml b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/loanApplicationService/src/main/resources/application.yml index e86bbd0e0f..b285fcd8bd 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/loanApplicationService/src/main/resources/application.yml +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/sampleProject/loanApplicationService/src/main/resources/application.yml @@ -1 +1 @@ -server.port=8090 \ No newline at end of file +server.port=8091 \ No newline at end of file diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/loanApplicationService/src/main/resources/application.yml b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/loanApplicationService/src/main/resources/application.yml index e86bbd0e0f..d3f59e8de6 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/loanApplicationService/src/main/resources/application.yml +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/resources/functionalTest/scenarioProject/loanApplicationService/src/main/resources/application.yml @@ -1 +1 @@ -server.port=8090 \ No newline at end of file +server.port=8092 \ No newline at end of file diff --git a/tests/spring-cloud-contract-stub-runner-amqp/src/test/resources/application.yml b/tests/spring-cloud-contract-stub-runner-amqp/src/test/resources/application.yml index fc2c41f064..9f1f63f6a7 100644 --- a/tests/spring-cloud-contract-stub-runner-amqp/src/test/resources/application.yml +++ b/tests/spring-cloud-contract-stub-runner-amqp/src/test/resources/application.yml @@ -2,4 +2,6 @@ stubrunner: repositoryRoot: classpath:m2repo/repository/ ids: org.springframework.cloud.contract.verifier.stubs.amqp:spring-cloud-contract-amqp-test:0.4.0-SNAPSHOT:stubs amqp: - enabled: true \ No newline at end of file + enabled: true +server: + port: 0 \ No newline at end of file diff --git a/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/resources/application.yml b/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/resources/application.yml index bfd49917db..be0dd59c16 100644 --- a/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/resources/application.yml +++ b/tests/spring-cloud-contract-stub-runner-boot-eureka/src/test/resources/application.yml @@ -2,3 +2,5 @@ stubrunner: camel.enabled: false idsToServiceIds: fraudDetectionServer: someNameThatShouldMapFraudDetectionServer +server: + port: 0 diff --git a/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/resources/application.yml b/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/resources/application.yml index bfd49917db..ddf61bbcac 100644 --- a/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/resources/application.yml +++ b/tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/resources/application.yml @@ -2,3 +2,5 @@ stubrunner: camel.enabled: false idsToServiceIds: fraudDetectionServer: someNameThatShouldMapFraudDetectionServer +server: + port: 0 \ No newline at end of file diff --git a/tests/spring-cloud-contract-stub-runner-camel/src/test/resources/application.yml b/tests/spring-cloud-contract-stub-runner-camel/src/test/resources/application.yml index 94fda10348..e851ff3af0 100644 --- a/tests/spring-cloud-contract-stub-runner-camel/src/test/resources/application.yml +++ b/tests/spring-cloud-contract-stub-runner-camel/src/test/resources/application.yml @@ -1,2 +1,4 @@ stubrunner.repositoryRoot: classpath:m2repo/repository/ -stubrunner.ids: org.springframework.cloud.contract.verifier.stubs:camelService \ No newline at end of file +stubrunner.ids: org.springframework.cloud.contract.verifier.stubs:camelService +server: + port: 0 \ No newline at end of file diff --git a/tests/spring-cloud-contract-stub-runner-integration/src/test/resources/application.yml b/tests/spring-cloud-contract-stub-runner-integration/src/test/resources/application.yml index b05ec59fad..4070412007 100644 --- a/tests/spring-cloud-contract-stub-runner-integration/src/test/resources/application.yml +++ b/tests/spring-cloud-contract-stub-runner-integration/src/test/resources/application.yml @@ -1,2 +1,4 @@ stubrunner.repositoryRoot: classpath:m2repo/repository/ -stubrunner.ids: org.springframework.cloud.contract.verifier.stubs:integrationService:0.0.1-SNAPSHOT \ No newline at end of file +stubrunner.ids: org.springframework.cloud.contract.verifier.stubs:integrationService:0.0.1-SNAPSHOT +server: + port: 0 \ No newline at end of file diff --git a/tests/spring-cloud-contract-stub-runner-stream/src/test/resources/application.yml b/tests/spring-cloud-contract-stub-runner-stream/src/test/resources/application.yml index 260fbdc91c..ba7c0e3ab1 100644 --- a/tests/spring-cloud-contract-stub-runner-stream/src/test/resources/application.yml +++ b/tests/spring-cloud-contract-stub-runner-stream/src/test/resources/application.yml @@ -8,4 +8,7 @@ spring: output: destination: returnBook input: - destination: bookStorage \ No newline at end of file + destination: bookStorage + +server: + port: 0 \ No newline at end of file