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

Polish

Browse Source
This commit is contained in:
Marcin Grzejszczak
2019-02-18 09:17:00 +01:00
parent 11965323ae
commit 6383285265
11 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java
View File

@@ -292,7 +292,7 @@ class WireMockProperties {
}
public boolean isPortDynamic() {
return portDynamic;
return this.portDynamic;
}
public void setPortDynamic(boolean portDynamic) {
@@ -300,7 +300,7 @@ class WireMockProperties {
}
public boolean isHttpsPortDynamic() {
return httpsPortDynamic;
return this.httpsPortDynamic;
}
public void setHttpsPortDynamic(boolean httpsPortDynamic) {

7
spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockTestExecutionListener.java
View File

@@ -101,6 +101,13 @@ public final class WireMockTestExecutionListener extends AbstractTestExecutionLi
boolean httpPortDynamic = wireMockProperties.wireMock.getServer().isPortDynamic();
boolean httpsPortDynamic = wireMockProperties.wireMock.getServer()
.isHttpsPortDynamic();
if (log.isDebugEnabled()) {
int httpPort = wireMockProperties.wireMock.getServer().getPort();
int httpsPort = wireMockProperties.wireMock.getServer().getPort();
log.debug("Http port [" + httpPort + "] dynamic [" + httpPortDynamic + "]"
+ " https port [" + httpsPort + "] dynamic [" + httpsPortDynamic
+ "]");
}
return !httpPortDynamic || !httpsPortDynamic;
}

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

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

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

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

1
spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockFilesApplicationTests.java
View File

@@ -39,4 +39,5 @@ public class AutoConfigureWireMockFilesApplicationTests {
assertThat(this.service.go())
.isEqualToIgnoringWhitespace("{\"message\":\"Hello Root\"}");
}
}

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

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

1
spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortApplicationTests.java
View File

@@ -46,4 +46,5 @@ public class AutoConfigureWireMockRandomPortApplicationTests {
.withHeader("Content-Type", "text/plain").withBody("Hello World!")));
assertThat(this.service.go()).isEqualTo("Hello World!");
}
}

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

@@ -50,9 +50,10 @@ public class AutoConfigureWireMockRandomPortHttpsApplicationTests {
@Test
public void portsAreNotFixed() {
boolean httpPortDynamic = wireMockProperties.getServer().isPortDynamic();
boolean httpsPortDynamic = wireMockProperties.getServer().isHttpsPortDynamic();
assertThat(!httpPortDynamic || !httpsPortDynamic).isFalse();
boolean httpPortDynamic = this.wireMockProperties.getServer().isPortDynamic();
boolean httpsPortDynamic = this.wireMockProperties.getServer().isHttpsPortDynamic();
assertThat(httpPortDynamic).isTrue();
assertThat(httpsPortDynamic).isTrue();
}
}

1
spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockSamePortApplicationTests.java
View File

@@ -45,4 +45,5 @@ public class AutoConfigureWireMockSamePortApplicationTests {
.withHeader("Content-Type", "text/plain").withBody("Hello World2!")));
assertThat(this.service.go2()).isEqualTo("Hello World2!");
}
}

1
spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockStubsAndMultipleFilesApplicationTests.java
View File

@@ -40,4 +40,5 @@ public class AutoConfigureWireMockStubsAndMultipleFilesApplicationTests {
assertThat(this.service.go())
.isEqualToIgnoringWhitespace("{\"message\":\"Hello Root\"}");
}
}

1
spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockStubsApplicationWithSlashTests.java
View File

@@ -38,4 +38,5 @@ public class AutoConfigureWireMockStubsApplicationWithSlashTests {
public void contextLoads() throws Exception {
assertThat(this.service.go()).isEqualTo("Hello World");
}
}