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

Fix GH-2035 AutoConfigureWiremock with a pre-defined custom port always defaults to port 8080 (#2036)

Browse Source
This commit is contained in:
Igor Dianov
2023-12-04 04:03:06 -08:00
committed by GitHub
parent 83b23eca54
commit d5bd388b10
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-cloud-contract-wiremock/src/main/java/org/springframework/cloud/contract/wiremock/WireMockApplicationListener.java
View File

@@ -19,6 +19,7 @@ package org.springframework.cloud.contract.wiremock;
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -63,9 +64,10 @@ public class WireMockApplicationListener implements ApplicationListener<Applicat
}
else {
Map<String, Object> source = getWireMockSource(environment);
source.put("wiremock.server.port", 8080);
Integer port = Optional.ofNullable(httpPortProperty).orElse(8080);
source.put("wiremock.server.port", port);
if (log.isDebugEnabled()) {
log.debug("Registered WireMock server port property to the default <8080> value");
log.debug("Registered WireMock server port property to the <" + port + "> value");
}
}
int httpsPortProperty = environment.getProperty("wiremock.server.https-port", Integer.class, 0);

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

@@ -16,6 +16,7 @@
package org.springframework.cloud.contract.wiremock;
import com.github.tomakehurst.wiremock.WireMockServer;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -24,6 +25,7 @@ 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.boot.test.system.OutputCaptureRule;
import org.springframework.core.env.Environment;
import org.springframework.test.context.junit4.SpringRunner;
import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
@@ -47,6 +49,12 @@ public class AutoConfigureWireMockApplicationTests {
@Autowired
private WireMockProperties wireMockProperties;
@Autowired
private WireMockServer wireMockServer;
@Autowired
private Environment env;
@Test
public void contextLoads() throws Exception {
stubFor(get(urlEqualTo("/test"))
@@ -63,4 +71,12 @@ public class AutoConfigureWireMockApplicationTests {
assertThat(!httpPortDynamic || !httpsPortDynamic).isTrue();
}
@Test
public void portIsAssigned() {
Integer expectedPort = 26384;
assertThat(this.wireMockServer.port()).isEqualTo(expectedPort);
assertThat(this.wireMockProperties.getServer().getPort()).isEqualTo(expectedPort);
assertThat(this.env.getProperty("wiremock.server.port", Integer.class)).isEqualTo(expectedPort);
}
}