From 66f7e9329ead5abe9c84a3dbdb5603281fd009b6 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 10 Jan 2019 16:50:48 +0100 Subject: [PATCH] Updated docs; fixes gh-846 --- README.adoc | 7 ++++++- .../example/WiremockForDocsClassRuleTests.java | 16 ++++++++-------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/README.adoc b/README.adoc index c4288d00f7..f7d971342d 100644 --- a/README.adoc +++ b/README.adoc @@ -1621,7 +1621,12 @@ public class WiremockForDocsClassRuleTests { public static WireMockClassRule wiremock = new WireMockClassRule( WireMockSpring.options().dynamicPort()); - // A service that calls out over HTTP to localhost:${wiremock.port} + @Before + public void setup() { + this.service.setBase("http://localhost:" + wiremock.port()); + } + + // A service that calls out over HTTP to wiremock's port @Autowired private Service service; diff --git a/samples/wiremock-jetty/src/test/java/com/example/WiremockForDocsClassRuleTests.java b/samples/wiremock-jetty/src/test/java/com/example/WiremockForDocsClassRuleTests.java index ac2f11118b..b1608b8ce2 100644 --- a/samples/wiremock-jetty/src/test/java/com/example/WiremockForDocsClassRuleTests.java +++ b/samples/wiremock-jetty/src/test/java/com/example/WiremockForDocsClassRuleTests.java @@ -1,14 +1,11 @@ package com.example; -import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; -import static com.github.tomakehurst.wiremock.client.WireMock.get; -import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; -import static org.assertj.core.api.Assertions.assertThat; - +import com.github.tomakehurst.wiremock.junit.WireMockClassRule; import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; @@ -16,7 +13,10 @@ import org.springframework.cloud.contract.wiremock.WireMockSpring; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.junit4.SpringRunner; -import com.github.tomakehurst.wiremock.junit.WireMockClassRule; +import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; +import static com.github.tomakehurst.wiremock.client.WireMock.get; +import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; +import static org.assertj.core.api.Assertions.assertThat; @ActiveProfiles("classrule") // tag::wiremock_test1[] @@ -31,13 +31,13 @@ public class WiremockForDocsClassRuleTests { WireMockSpring.options().dynamicPort()); // end::wiremock_test1[] + // tag::wiremock_test2[] @Before public void setup() { this.service.setBase("http://localhost:" + wiremock.port()); } - // tag::wiremock_test2[] - // A service that calls out over HTTP to localhost:${wiremock.port} + // A service that calls out over HTTP to wiremock's port @Autowired private Service service;