From 11cad9e0cb186dd5f2796861ddf3635c0890c316 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Wed, 12 Oct 2016 10:27:51 +0200 Subject: [PATCH] Fix sample in ref doc Closes gh-7142 --- spring-boot-docs/pom.xml | 1 + .../main/asciidoc/spring-boot-features.adoc | 23 +--------- .../boot/test/web/RandomPortExampleTests.java | 45 +++++++++++++++++++ 3 files changed, 47 insertions(+), 22 deletions(-) create mode 100644 spring-boot-docs/src/main/java/org/springframework/boot/test/web/RandomPortExampleTests.java diff --git a/spring-boot-docs/pom.xml b/spring-boot-docs/pom.xml index f16317f0f42..f5c35946f24 100644 --- a/spring-boot-docs/pom.xml +++ b/spring-boot-docs/pom.xml @@ -17,6 +17,7 @@ ${basedir}/.. + true diff --git a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc index ef035823539..483f1c35f8c 100644 --- a/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc +++ b/spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc @@ -4981,28 +4981,7 @@ For convenience, tests that need to make REST calls to the started server can ad [source,java,indent=0] ---- - import org.junit.*; - import org.junit.runner.*; - import org.springframework.boot.test.context.web.*; - import org.springframework.boot.test.web.client.*; - import org.springframework.test.context.junit4.*; - - import static org.assertj.core.api.Assertions.* - - @RunWith(SpringRunner.class) - @SpringBootTest(webEnvironment=WebEnvironment.RANDOM_PORT) - public class MyWebIntegrationTests { - - @Autowired - private TestRestTemplate restTemplate; - - @Test - public void exampleTest() { - String body = this.restTemplate.getForObject("/", String.class); - assertThat(body).isEqualTo("Hello World"); - } - - } +include::{code-examples}/test/web/RandomPortExampleTests.java[tag=test-random-port] ---- diff --git a/spring-boot-docs/src/main/java/org/springframework/boot/test/web/RandomPortExampleTests.java b/spring-boot-docs/src/main/java/org/springframework/boot/test/web/RandomPortExampleTests.java new file mode 100644 index 00000000000..5eee918cee1 --- /dev/null +++ b/spring-boot-docs/src/main/java/org/springframework/boot/test/web/RandomPortExampleTests.java @@ -0,0 +1,45 @@ +/* + * Copyright 2012-2016 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.boot.test.web; + +// tag::test-random-port[] +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; +import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.test.context.junit4.SpringRunner; + +import static org.assertj.core.api.Assertions.assertThat; + +@RunWith(SpringRunner.class) +@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) +public class RandomPortExampleTests { + + @Autowired + private TestRestTemplate restTemplate; + + @Test + public void exampleTest() { + String body = this.restTemplate.getForObject("/", String.class); + assertThat(body).isEqualTo("Hello World"); + } + +} +// tag::test-random-port[]