SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Parametrized maven; fixes gh-813

Browse Source
This commit is contained in:
Marcin Grzejszczak
2019-02-18 11:57:33 +01:00
parent ab49216445
commit 4747adf9bc
8 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockApplicationTests.java
View File

@@ -51,7 +51,8 @@ public class AutoConfigureWireMockApplicationTests {
@Test
public void portsAreFixed() {
boolean httpPortDynamic = this.wireMockProperties.getServer().isPortDynamic();
boolean httpsPortDynamic = this.wireMockProperties.getServer().isHttpsPortDynamic();
boolean httpsPortDynamic = this.wireMockProperties.getServer()
.isHttpsPortDynamic();
assertThat(!httpPortDynamic || !httpsPortDynamic).isTrue();
}

3
spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockAutoStubsApplicationTests.java
View File

@@ -46,7 +46,8 @@ public class AutoConfigureWireMockAutoStubsApplicationTests {
@Test
public void portsAreNotFixed() {
boolean httpPortDynamic = this.wireMockProperties.getServer().isPortDynamic();
boolean httpsPortDynamic = this.wireMockProperties.getServer().isHttpsPortDynamic();
boolean httpsPortDynamic = this.wireMockProperties.getServer()
.isHttpsPortDynamic();
assertThat(!httpPortDynamic || !httpsPortDynamic).isFalse();
}

3
spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockHttpsPortApplicationTests.java
View File

@@ -51,7 +51,8 @@ public class AutoConfigureWireMockHttpsPortApplicationTests {
@Test
public void portsAreFixed() {
boolean httpPortDynamic = this.wireMockProperties.getServer().isPortDynamic();
boolean httpsPortDynamic = this.wireMockProperties.getServer().isHttpsPortDynamic();
boolean httpsPortDynamic = this.wireMockProperties.getServer()
.isHttpsPortDynamic();
assertThat(!httpPortDynamic || !httpsPortDynamic).isTrue();
}

3
spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortHttpsApplicationTests.java
View File

@@ -51,7 +51,8 @@ public class AutoConfigureWireMockRandomPortHttpsApplicationTests {
@Test
public void portsAreNotFixed() {
boolean httpPortDynamic = this.wireMockProperties.getServer().isPortDynamic();
boolean httpsPortDynamic = this.wireMockProperties.getServer().isHttpsPortDynamic();
boolean httpsPortDynamic = this.wireMockProperties.getServer()
.isHttpsPortDynamic();
assertThat(httpPortDynamic).isTrue();
assertThat(httpsPortDynamic).isTrue();
}

10
spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/WiremockTestsApplication.java
View File

@@ -90,10 +90,9 @@ class Service {
public String pom() {
String requestUrl = this.base + "/pom.xml";
log.info("Will send a request to [" + requestUrl + "]");
return this.restTemplate
.exchange(RequestEntity.get(URI.create(requestUrl))
.accept(mediaTypes()).build(), String.class)
.getBody();
return this.restTemplate.exchange(
RequestEntity.get(URI.create(requestUrl)).accept(mediaTypes()).build(),
String.class).getBody();
}
private MediaType[] mediaTypes() {
@@ -106,8 +105,7 @@ class Service {
public String go2() {
String requestUrl = this.base + "/test2";
log.info("Will send a request to [" + requestUrl + "]");
return this.restTemplate.getForEntity(requestUrl, String.class)
.getBody();
return this.restTemplate.getForEntity(requestUrl, String.class).getBody();
}
public void setBase(String base) {