Migrated to JUNIT5

samples/standalone/restdocs/http-server/build.gradle

@@ -73,7 +73,6 @@ contracts {
 		baseClassMapping('.*standalone.*', 'com.example.fraud.FraudBaseWithStandaloneSetup')
 		baseClassMapping('.*webapp.*', 'com.example.fraud.FraudBaseWithWebAppSetup')
 	}
-	testFramework("JUNIT")
 }
 
 generateClientStubs.enabled = false
@@ -88,6 +87,10 @@ artifacts {
 	archives stubsJar
 }
 
+test {
+	useJUnitPlatform()
+}
+
 task copySnippets(type: Copy, dependsOn: test) {
 	from "target/snippets/stubs"
 	into "${project.buildDir}/stubs/META-INF/${project.group}/${project.name}/${project.version}/mappings"

samples/standalone/restdocs/http-server/pom.xml

@@ -148,7 +148,6 @@
 							</baseClassFQN>
 						</baseClassMapping>
 					</baseClassMappings>
-					<testFramework>JUNIT</testFramework>
 				</configuration>
 			</plugin>
 			<!-- end::plugin[] -->

samples/standalone/restdocs/http-server/src/test/java/com/example/fraud/FraudBaseWithStandaloneSetup.java

@@ -1,34 +1,44 @@
+/*
+ * Copyright 2013-2020 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.
+ */
+
 // tag::base_class[]
 package com.example.fraud;
 
 import io.restassured.module.mockmvc.RestAssuredMockMvc;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.rules.TestName;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.extension.ExtendWith;
 
-import org.springframework.restdocs.JUnitRestDocumentation;
+import org.springframework.restdocs.RestDocumentationContextProvider;
+import org.springframework.restdocs.RestDocumentationExtension;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 
 import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
 import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.documentationConfiguration;
 
+@ExtendWith(RestDocumentationExtension.class)
 public abstract class FraudBaseWithStandaloneSetup {
 
-	private static final String OUTPUT = "target/generated-snippets";
-
-	@Rule
-	public JUnitRestDocumentation restDocumentation = new JUnitRestDocumentation(OUTPUT);
-
-	@Rule
-	public TestName testName = new TestName();
-
-	@Before
-	public void setup() {
+	@BeforeEach
+	public void setup(TestInfo info, RestDocumentationContextProvider restDocumentation) {
 		RestAssuredMockMvc.standaloneSetup(MockMvcBuilders
 				.standaloneSetup(new FraudDetectionController())
-				.apply(documentationConfiguration(this.restDocumentation))
+				.apply(documentationConfiguration(restDocumentation))
 				.alwaysDo(document(
-						getClass().getSimpleName() + "_" + testName.getMethodName())));
+						getClass().getSimpleName() + "_" + info.getDisplayName())));
 	}
 
 }

samples/standalone/restdocs/http-server/src/test/java/com/example/fraud/FraudBaseWithWebAppSetup.java

@@ -1,44 +1,50 @@
+/*
+ * Copyright 2013-2020 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.
+ */
+
 // tag::base_class[]
 package com.example.fraud;
 
 import io.restassured.module.mockmvc.RestAssuredMockMvc;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.rules.TestName;
-import org.junit.runner.RunWith;
-
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.TestInfo;
+import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.restdocs.JUnitRestDocumentation;
-import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.restdocs.RestDocumentationContextProvider;
+import org.springframework.restdocs.RestDocumentationExtension;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
 
 import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
 import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.documentationConfiguration;
 
-@RunWith(SpringRunner.class)
+@ExtendWith(RestDocumentationExtension.class)
 @SpringBootTest(classes = Application.class)
 public abstract class FraudBaseWithWebAppSetup {
 
-	private static final String OUTPUT = "target/generated-snippets";
-
-	@Rule
-	public JUnitRestDocumentation restDocumentation = new JUnitRestDocumentation(OUTPUT);
-
-	@Rule
-	public TestName testName = new TestName();
-
 	@Autowired
 	private WebApplicationContext context;
 
-	@Before
-	public void setup() {
+	@BeforeEach
+	public void setup(TestInfo info, RestDocumentationContextProvider restDocumentation) {
 		RestAssuredMockMvc.mockMvc(MockMvcBuilders.webAppContextSetup(this.context)
-				.apply(documentationConfiguration(this.restDocumentation))
+				.apply(documentationConfiguration(restDocumentation))
 				.alwaysDo(document(
-						getClass().getSimpleName() + "_" + testName.getMethodName()))
+						getClass().getSimpleName() + "_" + info.getDisplayName()))
 				.build());
 	}
 

samples/standalone/restdocs/http-server/src/test/java/com/example/fraud/StubGeneratorTests.java

@@ -20,9 +20,8 @@ import java.math.BigDecimal;
 
 import com.example.fraud.model.FraudCheck;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +32,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.json.JacksonTester;
 import org.springframework.http.MediaType;
 
-import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
 
@@ -41,7 +39,6 @@ import static org.springframework.cloud.contract.wiremock.restdocs.WireMockRestD
 import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class)
 @AutoConfigureRestDocs
 @AutoConfigureMockMvc
@@ -53,7 +50,7 @@ public class StubGeneratorTests {
 
 	private JacksonTester<FraudCheck> json;
 
-	@Before
+	@BeforeEach
 	public void setup() {
 		ObjectMapper objectMappper = new ObjectMapper();
 		// Possibly configure the mapper

samples/standalone/restdocs/http-server/src/test/java/com/example/fraud/XmlStubGeneratorTests.java

@@ -16,9 +16,7 @@
 
 package com.example.fraud;
 
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
@@ -34,7 +32,6 @@ import static org.springframework.test.web.servlet.request.MockMvcRequestBuilder
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes = Application.class)
 @AutoConfigureRestDocs(outputDir = "target/snippets")
 @AutoConfigureMockMvc