Make use of Gradle's support for test fixtures

Closes gh-756

spring-restdocs-core/build.gradle

@@ -1,6 +1,7 @@
 plugins {
 	id "io.spring.compatibility-test" version "0.0.1"
 	id "java-library"
+	id "java-test-fixtures"
 	id "maven-publish"
 	id "optional-dependencies"
 }
@@ -49,6 +50,15 @@ dependencies {
 	optional("junit:junit")
 	optional("org.hibernate.validator:hibernate-validator")
 	optional("org.junit.jupiter:junit-jupiter-api")
+	
+	testFixturesApi(platform(project(":spring-restdocs-platform")))
+	testFixturesApi("junit:junit")
+	testFixturesApi("org.assertj:assertj-core")
+	testFixturesApi("org.hamcrest:hamcrest-core")
+	testFixturesImplementation(files(jmustacheRepackJar))
+	testFixturesImplementation("org.hamcrest:hamcrest-library")
+	testFixturesImplementation("org.springframework:spring-core")
+	testFixturesImplementation("org.springframework:spring-web")
 
 	testImplementation("junit:junit")
 	testImplementation("org.assertj:assertj-core")
@@ -68,13 +78,12 @@ jar {
 	}
 }
 
-task testJar(type: Jar) {
-	classifier "test"
-	from sourceSets.test.output
+components.java.withVariantsFromConfiguration(configurations.testFixturesApiElements) {
+	skip()
 }
 
-artifacts {
-	testArtifacts testJar
+components.java.withVariantsFromConfiguration(configurations.testFixturesRuntimeElements) {
+	skip()
 }
 
 compatibilityTest {

spring-restdocs-core/src/test/java/org/springframework/restdocs/AbstractSnippetTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -28,13 +28,13 @@ import org.springframework.core.io.FileSystemResource;
 import org.springframework.http.HttpStatus;
 import org.springframework.restdocs.templates.TemplateFormat;
 import org.springframework.restdocs.templates.TemplateFormats;
-import org.springframework.restdocs.test.GeneratedSnippets;
-import org.springframework.restdocs.test.OperationBuilder;
-import org.springframework.restdocs.test.SnippetConditions;
-import org.springframework.restdocs.test.SnippetConditions.CodeBlockCondition;
-import org.springframework.restdocs.test.SnippetConditions.HttpRequestCondition;
-import org.springframework.restdocs.test.SnippetConditions.HttpResponseCondition;
-import org.springframework.restdocs.test.SnippetConditions.TableCondition;
+import org.springframework.restdocs.testfixtures.GeneratedSnippets;
+import org.springframework.restdocs.testfixtures.OperationBuilder;
+import org.springframework.restdocs.testfixtures.SnippetConditions;
+import org.springframework.restdocs.testfixtures.SnippetConditions.CodeBlockCondition;
+import org.springframework.restdocs.testfixtures.SnippetConditions.HttpRequestCondition;
+import org.springframework.restdocs.testfixtures.SnippetConditions.HttpResponseCondition;
+import org.springframework.restdocs.testfixtures.SnippetConditions.TableCondition;
 import org.springframework.web.bind.annotation.RequestMethod;
 
 /**

spring-restdocs-core/src/test/java/org/springframework/restdocs/headers/RequestHeadersSnippetFailureTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -25,7 +25,7 @@ import org.junit.rules.ExpectedException;
 
 import org.springframework.restdocs.snippet.SnippetException;
 import org.springframework.restdocs.templates.TemplateFormats;
-import org.springframework.restdocs.test.OperationBuilder;
+import org.springframework.restdocs.testfixtures.OperationBuilder;
 
 import static org.hamcrest.CoreMatchers.endsWith;
 import static org.hamcrest.CoreMatchers.equalTo;

spring-restdocs-core/src/test/java/org/springframework/restdocs/headers/ResponseHeadersSnippetFailureTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -25,7 +25,7 @@ import org.junit.rules.ExpectedException;
 
 import org.springframework.restdocs.snippet.SnippetException;
 import org.springframework.restdocs.templates.TemplateFormats;
-import org.springframework.restdocs.test.OperationBuilder;
+import org.springframework.restdocs.testfixtures.OperationBuilder;
 
 import static org.hamcrest.CoreMatchers.endsWith;
 import static org.hamcrest.CoreMatchers.equalTo;

spring-restdocs-core/src/test/java/org/springframework/restdocs/hypermedia/LinksSnippetFailureTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -26,7 +26,7 @@ import org.junit.rules.ExpectedException;
 
 import org.springframework.restdocs.snippet.SnippetException;
 import org.springframework.restdocs.templates.TemplateFormats;
-import org.springframework.restdocs.test.OperationBuilder;
+import org.springframework.restdocs.testfixtures.OperationBuilder;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 

spring-restdocs-core/src/test/java/org/springframework/restdocs/operation/preprocess/PrettyPrintingContentModifierTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -23,7 +23,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.Rule;
 import org.junit.Test;
 
-import org.springframework.restdocs.test.OutputCapture;
+import org.springframework.restdocs.testfixtures.OutputCapture;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.isEmptyString;

spring-restdocs-core/src/test/java/org/springframework/restdocs/payload/AsciidoctorRequestFieldsSnippetTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -27,9 +27,9 @@ import org.springframework.restdocs.templates.TemplateEngine;
 import org.springframework.restdocs.templates.TemplateFormats;
 import org.springframework.restdocs.templates.TemplateResourceResolver;
 import org.springframework.restdocs.templates.mustache.MustacheTemplateEngine;
-import org.springframework.restdocs.test.GeneratedSnippets;
-import org.springframework.restdocs.test.OperationBuilder;
-import org.springframework.restdocs.test.SnippetConditions;
+import org.springframework.restdocs.testfixtures.GeneratedSnippets;
+import org.springframework.restdocs.testfixtures.OperationBuilder;
+import org.springframework.restdocs.testfixtures.SnippetConditions;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;

spring-restdocs-core/src/test/java/org/springframework/restdocs/payload/RequestFieldsSnippetFailureTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -28,7 +28,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.restdocs.snippet.SnippetException;
 import org.springframework.restdocs.templates.TemplateFormats;
-import org.springframework.restdocs.test.OperationBuilder;
+import org.springframework.restdocs.testfixtures.OperationBuilder;
 
 import static org.hamcrest.CoreMatchers.endsWith;
 import static org.hamcrest.CoreMatchers.equalTo;

spring-restdocs-core/src/test/java/org/springframework/restdocs/payload/RequestPartFieldsSnippetFailureTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -26,7 +26,7 @@ import org.junit.rules.ExpectedException;
 
 import org.springframework.restdocs.snippet.SnippetException;
 import org.springframework.restdocs.templates.TemplateFormats;
-import org.springframework.restdocs.test.OperationBuilder;
+import org.springframework.restdocs.testfixtures.OperationBuilder;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.startsWith;

spring-restdocs-core/src/test/java/org/springframework/restdocs/payload/ResponseFieldsSnippetFailureTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -28,7 +28,7 @@ import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.restdocs.snippet.SnippetException;
 import org.springframework.restdocs.templates.TemplateFormats;
-import org.springframework.restdocs.test.OperationBuilder;
+import org.springframework.restdocs.testfixtures.OperationBuilder;
 
 import static org.hamcrest.CoreMatchers.endsWith;
 import static org.hamcrest.CoreMatchers.equalTo;

spring-restdocs-core/src/test/java/org/springframework/restdocs/request/PathParametersSnippetFailureTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -27,7 +27,7 @@ import org.junit.rules.ExpectedException;
 import org.springframework.restdocs.generate.RestDocumentationGenerator;
 import org.springframework.restdocs.snippet.SnippetException;
 import org.springframework.restdocs.templates.TemplateFormats;
-import org.springframework.restdocs.test.OperationBuilder;
+import org.springframework.restdocs.testfixtures.OperationBuilder;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName;

spring-restdocs-core/src/test/java/org/springframework/restdocs/request/RequestParametersSnippetFailureTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -26,7 +26,7 @@ import org.junit.rules.ExpectedException;
 
 import org.springframework.restdocs.snippet.SnippetException;
 import org.springframework.restdocs.templates.TemplateFormats;
-import org.springframework.restdocs.test.OperationBuilder;
+import org.springframework.restdocs.testfixtures.OperationBuilder;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName;

spring-restdocs-core/src/test/java/org/springframework/restdocs/request/RequestPartsSnippetFailureTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -26,7 +26,7 @@ import org.junit.rules.ExpectedException;
 
 import org.springframework.restdocs.snippet.SnippetException;
 import org.springframework.restdocs.templates.TemplateFormats;
-import org.springframework.restdocs.test.OperationBuilder;
+import org.springframework.restdocs.testfixtures.OperationBuilder;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.springframework.restdocs.request.RequestDocumentation.partWithName;

spring-restdocs-core/src/test/java/org/springframework/restdocs/snippet/TemplatedSnippetTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -26,8 +26,8 @@ import org.junit.Test;
 
 import org.springframework.restdocs.operation.Operation;
 import org.springframework.restdocs.templates.TemplateFormats;
-import org.springframework.restdocs.test.GeneratedSnippets;
-import org.springframework.restdocs.test.OperationBuilder;
+import org.springframework.restdocs.testfixtures.GeneratedSnippets;
+import org.springframework.restdocs.testfixtures.OperationBuilder;
 
 import static org.assertj.core.api.Assertions.assertThat;
 

spring-restdocs-core/src/testFixtures/java/org/springframework/restdocs/testfixtures/GeneratedSnippets.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.restdocs.test;
+package org.springframework.restdocs.testfixtures;
 
 import java.io.File;
 import java.io.FileInputStream;

spring-restdocs-core/src/testFixtures/java/org/springframework/restdocs/testfixtures/OperationBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.restdocs.test;
+package org.springframework.restdocs.testfixtures;
 
 import java.io.File;
 import java.net.URI;

spring-restdocs-core/src/testFixtures/java/org/springframework/restdocs/testfixtures/OperationTestRule.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.restdocs.test;
+package org.springframework.restdocs.testfixtures;
 
 import java.io.File;
 

spring-restdocs-core/src/testFixtures/java/org/springframework/restdocs/testfixtures/OutputCapture.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2019 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.restdocs.test;
+package org.springframework.restdocs.testfixtures;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

spring-restdocs-core/src/testFixtures/java/org/springframework/restdocs/testfixtures/SnippetConditions.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.restdocs.test;
+package org.springframework.restdocs.testfixtures;
 
 import java.io.StringWriter;
 import java.util.ArrayList;
@@ -149,7 +149,7 @@ public final class SnippetConditions {
 	/**
 	 * Base class for code block Conditions.
 	 *
-	 * @param <T> The type of the Condition
+	 * @param <T> the type of the Condition
 	 */
 	public static class CodeBlockCondition<T extends CodeBlockCondition<T>> extends AbstractSnippetContentCondition {
 
@@ -164,7 +164,7 @@ public final class SnippetConditions {
 	/**
 	 * A {@link Condition} for an Asciidoctor code block.
 	 *
-	 * @param <T> The type of the Condition
+	 * @param <T> the type of the Condition
 	 */
 	public static class AsciidoctorCodeBlockCondition<T extends AsciidoctorCodeBlockCondition<T>>
 			extends CodeBlockCondition<T> {
@@ -181,7 +181,7 @@ public final class SnippetConditions {
 	/**
 	 * A {@link Condition} for a Markdown code block.
 	 *
-	 * @param <T> The type of the Condition
+	 * @param <T> the type of the Condition
 	 */
 	public static class MarkdownCodeBlockCondition<T extends MarkdownCodeBlockCondition<T>>
 			extends CodeBlockCondition<T> {
@@ -196,7 +196,7 @@ public final class SnippetConditions {
 	/**
 	 * A {@link Condition} for an HTTP request or response.
 	 *
-	 * @param <T> The type of the Condition
+	 * @param <T> the type of the Condition
 	 */
 	public abstract static class HttpCondition<T extends HttpCondition<T>> extends Condition<String> {
 
@@ -271,7 +271,7 @@ public final class SnippetConditions {
 	/**
 	 * Base class for table Conditions.
 	 *
-	 * @param <T> The concrete type of the Condition
+	 * @param <T> the concrete type of the Condition
 	 */
 	public abstract static class TableCondition<T extends TableCondition<T>> extends AbstractSnippetContentCondition {
 

spring-restdocs-mockmvc/build.gradle

@@ -16,7 +16,7 @@ dependencies {
 
 	internal(platform(project(":spring-restdocs-platform")))
 
-	testImplementation(project(path: ":spring-restdocs-core", configuration: "testArtifacts"))
+	testImplementation(testFixtures(project(":spring-restdocs-core")))
 	testImplementation("junit:junit")
 	testImplementation("org.assertj:assertj-core")
 	testImplementation("org.hamcrest:hamcrest-library")

spring-restdocs-mockmvc/src/test/java/org/springframework/restdocs/mockmvc/MockMvcRestDocumentationIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -52,10 +52,10 @@ import org.springframework.restdocs.JUnitRestDocumentation;
 import org.springframework.restdocs.mockmvc.MockMvcRestDocumentationIntegrationTests.TestConfiguration;
 import org.springframework.restdocs.templates.TemplateFormat;
 import org.springframework.restdocs.templates.TemplateFormats;
-import org.springframework.restdocs.test.SnippetConditions;
-import org.springframework.restdocs.test.SnippetConditions.CodeBlockCondition;
-import org.springframework.restdocs.test.SnippetConditions.HttpRequestCondition;
-import org.springframework.restdocs.test.SnippetConditions.HttpResponseCondition;
+import org.springframework.restdocs.testfixtures.SnippetConditions;
+import org.springframework.restdocs.testfixtures.SnippetConditions.CodeBlockCondition;
+import org.springframework.restdocs.testfixtures.SnippetConditions.HttpRequestCondition;
+import org.springframework.restdocs.testfixtures.SnippetConditions.HttpResponseCondition;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.test.context.web.WebAppConfiguration;

spring-restdocs-restassured/build.gradle

@@ -14,7 +14,7 @@ dependencies {
 
 	internal(platform(project(":spring-restdocs-platform")))
 
-	testImplementation(project(path: ":spring-restdocs-core", configuration: "testArtifacts"))
+	testImplementation(testFixtures(project(":spring-restdocs-core")))
 	testImplementation("com.fasterxml.jackson.core:jackson-databind")
 	testImplementation("junit:junit")
 	testImplementation("org.apache.tomcat.embed:tomcat-embed-core:8.5.13")

spring-restdocs-restassured/src/test/java/org/springframework/restdocs/restassured3/RestAssuredRestDocumentationIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -38,10 +38,10 @@ import org.springframework.http.MediaType;
 import org.springframework.restdocs.JUnitRestDocumentation;
 import org.springframework.restdocs.templates.TemplateFormat;
 import org.springframework.restdocs.templates.TemplateFormats;
-import org.springframework.restdocs.test.SnippetConditions;
-import org.springframework.restdocs.test.SnippetConditions.CodeBlockCondition;
-import org.springframework.restdocs.test.SnippetConditions.HttpRequestCondition;
-import org.springframework.restdocs.test.SnippetConditions.HttpResponseCondition;
+import org.springframework.restdocs.testfixtures.SnippetConditions;
+import org.springframework.restdocs.testfixtures.SnippetConditions.CodeBlockCondition;
+import org.springframework.restdocs.testfixtures.SnippetConditions.HttpRequestCondition;
+import org.springframework.restdocs.testfixtures.SnippetConditions.HttpResponseCondition;
 import org.springframework.util.FileCopyUtils;
 import org.springframework.web.bind.annotation.RequestMethod;
 

spring-restdocs-webtestclient/build.gradle

@@ -13,7 +13,7 @@ dependencies {
 
 	internal(platform(project(":spring-restdocs-platform")))
 
-	testImplementation(project(path: ":spring-restdocs-core", configuration: "testArtifacts"))
+	testImplementation(testFixtures(project(":spring-restdocs-core")))
 	testImplementation("junit:junit")
 	testImplementation("org.assertj:assertj-core")
 	testImplementation("org.hamcrest:hamcrest-library")

spring-restdocs-webtestclient/src/test/java/org/springframework/restdocs/webtestclient/WebTestClientRestDocumentationIntegrationTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -41,10 +41,10 @@ import org.springframework.http.ResponseCookie;
 import org.springframework.restdocs.JUnitRestDocumentation;
 import org.springframework.restdocs.templates.TemplateFormat;
 import org.springframework.restdocs.templates.TemplateFormats;
-import org.springframework.restdocs.test.SnippetConditions;
-import org.springframework.restdocs.test.SnippetConditions.CodeBlockCondition;
-import org.springframework.restdocs.test.SnippetConditions.HttpResponseCondition;
-import org.springframework.restdocs.test.SnippetConditions.TableCondition;
+import org.springframework.restdocs.testfixtures.SnippetConditions;
+import org.springframework.restdocs.testfixtures.SnippetConditions.CodeBlockCondition;
+import org.springframework.restdocs.testfixtures.SnippetConditions.HttpResponseCondition;
+import org.springframework.restdocs.testfixtures.SnippetConditions.TableCondition;
 import org.springframework.test.web.reactive.server.EntityExchangeResult;
 import org.springframework.test.web.reactive.server.WebTestClient;
 import org.springframework.util.FileCopyUtils;