Merge branch '1.5.x'

spring-boot-docs/pom.xml

@@ -17,6 +17,7 @@
 	</organization>
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
+		<disable.checks>true</disable.checks>
 	</properties>
 	<dependencies>
 		<dependency>

spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc

@@ -4906,28 +4906,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]
 ----
 
 

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[]