From 6383285265d8b5983b6e3568a77cf49181f741fc Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Mon, 18 Feb 2019 09:17:00 +0100 Subject: [PATCH] Polish --- .../cloud/contract/wiremock/WireMockConfiguration.java | 4 ++-- .../contract/wiremock/WireMockTestExecutionListener.java | 7 +++++++ .../wiremock/AutoConfigureWireMockApplicationTests.java | 4 ++-- .../AutoConfigureWireMockAutoStubsApplicationTests.java | 4 ++-- .../AutoConfigureWireMockFilesApplicationTests.java | 1 + .../AutoConfigureWireMockHttpsPortApplicationTests.java | 4 ++-- .../AutoConfigureWireMockRandomPortApplicationTests.java | 1 + ...toConfigureWireMockRandomPortHttpsApplicationTests.java | 7 ++++--- .../AutoConfigureWireMockSamePortApplicationTests.java | 1 + ...igureWireMockStubsAndMultipleFilesApplicationTests.java | 1 + ...utoConfigureWireMockStubsApplicationWithSlashTests.java | 1 + 11 files changed, 24 insertions(+), 11 deletions(-) diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java index 411ac6f611..ca9ed89093 100644 --- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java +++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockConfiguration.java @@ -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) { diff --git a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockTestExecutionListener.java b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockTestExecutionListener.java index 7d3684c671..1d2522b3a6 100644 --- a/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockTestExecutionListener.java +++ b/spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockTestExecutionListener.java @@ -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; } diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockApplicationTests.java index f88de6aaee..7a6b845977 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockApplicationTests.java @@ -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(); } diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockAutoStubsApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockAutoStubsApplicationTests.java index e34e9d61c3..ab2aa2ba06 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockAutoStubsApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockAutoStubsApplicationTests.java @@ -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(); } diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockFilesApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockFilesApplicationTests.java index 43200eeecd..28a077fcf3 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockFilesApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockFilesApplicationTests.java @@ -39,4 +39,5 @@ public class AutoConfigureWireMockFilesApplicationTests { assertThat(this.service.go()) .isEqualToIgnoringWhitespace("{\"message\":\"Hello Root\"}"); } + } diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockHttpsPortApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockHttpsPortApplicationTests.java index 5f1ba89979..d1e09f18c9 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockHttpsPortApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockHttpsPortApplicationTests.java @@ -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(); } diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortApplicationTests.java index 230c00d66c..7c6430f2cb 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortApplicationTests.java @@ -46,4 +46,5 @@ public class AutoConfigureWireMockRandomPortApplicationTests { .withHeader("Content-Type", "text/plain").withBody("Hello World!"))); assertThat(this.service.go()).isEqualTo("Hello World!"); } + } diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortHttpsApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortHttpsApplicationTests.java index 69019e8996..dd92b66413 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortHttpsApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockRandomPortHttpsApplicationTests.java @@ -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(); } } diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockSamePortApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockSamePortApplicationTests.java index 6489b4a2cf..4f161391e7 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockSamePortApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockSamePortApplicationTests.java @@ -45,4 +45,5 @@ public class AutoConfigureWireMockSamePortApplicationTests { .withHeader("Content-Type", "text/plain").withBody("Hello World2!"))); assertThat(this.service.go2()).isEqualTo("Hello World2!"); } + } diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockStubsAndMultipleFilesApplicationTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockStubsAndMultipleFilesApplicationTests.java index daff95c235..05491aa535 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockStubsAndMultipleFilesApplicationTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockStubsAndMultipleFilesApplicationTests.java @@ -40,4 +40,5 @@ public class AutoConfigureWireMockStubsAndMultipleFilesApplicationTests { assertThat(this.service.go()) .isEqualToIgnoringWhitespace("{\"message\":\"Hello Root\"}"); } + } diff --git a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockStubsApplicationWithSlashTests.java b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockStubsApplicationWithSlashTests.java index ae54dad926..d844349575 100644 --- a/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockStubsApplicationWithSlashTests.java +++ b/spring-cloud-contract-wiremock/src/test/java/org/springframework/cloud/contract/wiremock/AutoConfigureWireMockStubsApplicationWithSlashTests.java @@ -38,4 +38,5 @@ public class AutoConfigureWireMockStubsApplicationWithSlashTests { public void contextLoads() throws Exception { assertThat(this.service.go()).isEqualTo("Hello World"); } + }