Merge branch '2.1.x'

Closes gh-17840

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

@@ -8297,30 +8297,15 @@ which auto-configures one for you.
 [[boot-features-output-capture-test-utility]]
 ==== OutputCapture
 `OutputCapture` is a JUnit `Extension` that you can use to capture `System.out` and
-`System.err` output. To use with {@link ExtendWith @ExtendWith}, you can inject
-`CapturedOutput` as an argument to your test class constructor or test method as follows:
+`System.err` output. To use with `@ExtendWith`, you can inject `CapturedOutput` as an
+argument to your test class constructor or test method as follows:
 
 [source,java,indent=0]
 ----
-	import org.junit.jupiter.api.Test;
-    import org.junit.jupiter.api.extension.ExtendWith;
-
-    import org.springframework.boot.test.system.CapturedOutput;
-    import org.springframework.boot.test.system.OutputCaptureExtension;
-
-	import static org.assertj.core.api.Assertions.assertThat;
+include::{test-examples}/test/system/OutputCaptureTests.java[tag=test]
+----
 
-	@ExtendWith(OutputCaptureExtension.class)
-	class MyTest {
 
-		@Test
-		void testName(CapturedOutput output) {
-			System.out.println("Hello World!");
-			assertThat(output).contains("World");
-		}
-
-	}
-----
 
 [[boot-features-rest-templates-test-utility]]
 ==== TestRestTemplate

spring-boot-project/spring-boot-docs/src/test/java/org/springframework/boot/docs/test/system/OutputCaptureTests.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2012-2019 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
+ *
+ *      https://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.docs.test.system;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+import org.springframework.boot.test.system.CapturedOutput;
+import org.springframework.boot.test.system.OutputCaptureExtension;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Sample showcasing the use of {@link CapturedOutput}.
+ *
+ * @author Stephane Nicoll
+ */
+// tag::test[]
+@ExtendWith(OutputCaptureExtension.class)
+class OutputCaptureTests {
+
+	@Test
+	void testName(CapturedOutput output) {
+		System.out.println("Hello World!");
+		assertThat(output).contains("World");
+	}
+
+}
+// end::test[]