Remove use of Spring Boot from REST Assured module's integration tests

Closes gh-360

Author: wilkinsona

Diff for: spring-restdocs-restassured/build.gradle

@@ -9,13 +9,10 @@ dependencies {
 	compile project(':spring-restdocs-core')
 	compile 'com.jayway.restassured:rest-assured'
 
+	testCompile 'org.apache.tomcat.embed:tomcat-embed-core:8.5.11'
 	testCompile 'org.mockito:mockito-core'
 	testCompile 'org.hamcrest:hamcrest-library'
-	testCompile 'org.springframework.hateoas:spring-hateoas'
-	testCompile 'org.springframework.boot:spring-boot-starter-web:1.3.6.RELEASE'
-	testCompile 'org.springframework:spring-test'
 	testCompile project(path: ':spring-restdocs-core', configuration: 'testArtifacts')
-	testRuntime 'commons-logging:commons-logging:1.2'
 }
 
 test {

Diff for: spring-restdocs-restassured/src/test/java/org/springframework/restdocs/restassured/RestAssuredRequestConverterTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 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,25 +28,15 @@
 import com.jayway.restassured.RestAssured;
 import com.jayway.restassured.specification.FilterableRequestSpecification;
 import com.jayway.restassured.specification.RequestSpecification;
+import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
-import org.junit.runner.RunWith;
 
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.IntegrationTest;
-import org.springframework.boot.test.SpringApplicationConfiguration;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.restdocs.operation.OperationRequest;
 import org.springframework.restdocs.operation.OperationRequestPart;
-import org.springframework.restdocs.restassured.RestAssuredRequestConverterTests.TestApplication;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import org.springframework.test.context.web.WebAppConfiguration;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
@@ -57,33 +47,29 @@
  *
  * @author Andy Wilkinson
  */
-@RunWith(SpringJUnit4ClassRunner.class)
-@SpringApplicationConfiguration(classes = TestApplication.class)
-@WebAppConfiguration
-@IntegrationTest("server.port=0")
 public class RestAssuredRequestConverterTests {
 
+	@ClassRule
+	public static TomcatServer tomcat = new TomcatServer();
+
 	@Rule
 	public final ExpectedException thrown = ExpectedException.none();
 
 	private final RestAssuredRequestConverter factory = new RestAssuredRequestConverter();
 
-	@Value("${local.server.port}")
-	private int port;
-
 	@Test
 	public void requestUri() {
-		RequestSpecification requestSpec = RestAssured.given().port(this.port);
+		RequestSpecification requestSpec = RestAssured.given().port(tomcat.getPort());
 		requestSpec.get("/foo/bar");
 		OperationRequest request = this.factory
 				.convert((FilterableRequestSpecification) requestSpec);
-		assertThat(request.getUri(),
-				is(equalTo(URI.create("http://localhost:" + this.port + "/foo/bar"))));
+		assertThat(request.getUri(), is(equalTo(
+				URI.create("http://localhost:" + tomcat.getPort() + "/foo/bar"))));
 	}
 
 	@Test
 	public void requestMethod() {
-		RequestSpecification requestSpec = RestAssured.given().port(this.port);
+		RequestSpecification requestSpec = RestAssured.given().port(tomcat.getPort());
 		requestSpec.head("/foo/bar");
 		OperationRequest request = this.factory
 				.convert((FilterableRequestSpecification) requestSpec);
@@ -92,7 +78,7 @@ public void requestMethod() {
 
 	@Test
 	public void queryStringParameters() {
-		RequestSpecification requestSpec = RestAssured.given().port(this.port)
+		RequestSpecification requestSpec = RestAssured.given().port(tomcat.getPort())
 				.queryParam("foo", "bar");
 		requestSpec.get("/");
 		OperationRequest request = this.factory
@@ -103,7 +89,7 @@ public void queryStringParameters() {
 
 	@Test
 	public void queryStringFromUrlParameters() {
-		RequestSpecification requestSpec = RestAssured.given().port(this.port);
+		RequestSpecification requestSpec = RestAssured.given().port(tomcat.getPort());
 		requestSpec.get("/?foo=bar");
 		OperationRequest request = this.factory
 				.convert((FilterableRequestSpecification) requestSpec);
@@ -113,7 +99,7 @@ public void queryStringFromUrlParameters() {
 
 	@Test
 	public void formParameters() {
-		RequestSpecification requestSpec = RestAssured.given().port(this.port)
+		RequestSpecification requestSpec = RestAssured.given().port(tomcat.getPort())
 				.formParameter("foo", "bar");
 		requestSpec.get("/");
 		OperationRequest request = this.factory
@@ -124,7 +110,7 @@ public void formParameters() {
 
 	@Test
 	public void requestParameters() {
-		RequestSpecification requestSpec = RestAssured.given().port(this.port)
+		RequestSpecification requestSpec = RestAssured.given().port(tomcat.getPort())
 				.parameter("foo", "bar");
 		requestSpec.get("/");
 		OperationRequest request = this.factory
@@ -135,7 +121,7 @@ public void requestParameters() {
 
 	@Test
 	public void headers() {
-		RequestSpecification requestSpec = RestAssured.given().port(this.port)
+		RequestSpecification requestSpec = RestAssured.given().port(tomcat.getPort())
 				.header("Foo", "bar");
 		requestSpec.get("/");
 		OperationRequest request = this.factory
@@ -144,15 +130,15 @@ public void headers() {
 		assertThat(request.getHeaders().get("Foo"), is(equalTo(Arrays.asList("bar"))));
 		assertThat(request.getHeaders().get("Accept"), is(equalTo(Arrays.asList("*/*"))));
 		assertThat(request.getHeaders().get("Host"),
-				is(equalTo(Arrays.asList("localhost:" + this.port))));
+				is(equalTo(Arrays.asList("localhost:" + tomcat.getPort()))));
 	}
 
 	@Test
 	public void multipart() {
-		RequestSpecification requestSpec = RestAssured.given().port(this.port)
+		RequestSpecification requestSpec = RestAssured.given().port(tomcat.getPort())
 				.multiPart("a", "a.txt", "alpha", null)
 				.multiPart("b", new ObjectBody("bar"), "application/json");
-		requestSpec.post().then().statusCode(200);
+		requestSpec.post();
 		OperationRequest request = this.factory
 				.convert((FilterableRequestSpecification) requestSpec);
 		Collection<OperationRequestPart> parts = request.getParts();
@@ -174,15 +160,15 @@ public void multipart() {
 	@Test
 	public void byteArrayBody() {
 		RequestSpecification requestSpec = RestAssured.given().body("body".getBytes())
-				.port(this.port);
+				.port(tomcat.getPort());
 		requestSpec.post();
 		this.factory.convert((FilterableRequestSpecification) requestSpec);
 	}
 
 	@Test
 	public void stringBody() {
 		RequestSpecification requestSpec = RestAssured.given().body("body")
-				.port(this.port);
+				.port(tomcat.getPort());
 		requestSpec.post();
 		OperationRequest request = this.factory
 				.convert((FilterableRequestSpecification) requestSpec);
@@ -192,7 +178,7 @@ public void stringBody() {
 	@Test
 	public void objectBody() {
 		RequestSpecification requestSpec = RestAssured.given().body(new ObjectBody("bar"))
-				.port(this.port);
+				.port(tomcat.getPort());
 		requestSpec.post();
 		OperationRequest request = this.factory
 				.convert((FilterableRequestSpecification) requestSpec);
@@ -203,7 +189,7 @@ public void objectBody() {
 	public void byteArrayInputStreamBody() {
 		RequestSpecification requestSpec = RestAssured.given()
 				.body(new ByteArrayInputStream(new byte[] { 1, 2, 3, 4 }))
-				.port(this.port);
+				.port(tomcat.getPort());
 		requestSpec.post();
 		OperationRequest request = this.factory
 				.convert((FilterableRequestSpecification) requestSpec);
@@ -213,7 +199,7 @@ public void byteArrayInputStreamBody() {
 	@Test
 	public void fileBody() {
 		RequestSpecification requestSpec = RestAssured.given()
-				.body(new File("src/test/resources/body.txt")).port(this.port);
+				.body(new File("src/test/resources/body.txt")).port(tomcat.getPort());
 		requestSpec.post();
 		OperationRequest request = this.factory
 				.convert((FilterableRequestSpecification) requestSpec);
@@ -224,7 +210,7 @@ public void fileBody() {
 	public void fileInputStreamBody() throws FileNotFoundException {
 		FileInputStream inputStream = new FileInputStream("src/test/resources/body.txt");
 		RequestSpecification requestSpec = RestAssured.given().body(inputStream)
-				.port(this.port);
+				.port(tomcat.getPort());
 		requestSpec.post();
 		this.thrown.expect(IllegalStateException.class);
 		this.thrown.expectMessage("Cannot read content from input stream " + inputStream
@@ -234,7 +220,7 @@ public void fileInputStreamBody() throws FileNotFoundException {
 
 	@Test
 	public void multipartWithByteArrayInputStreamBody() {
-		RequestSpecification requestSpec = RestAssured.given().port(this.port)
+		RequestSpecification requestSpec = RestAssured.given().port(tomcat.getPort())
 				.multiPart("foo", "foo.txt", new ByteArrayInputStream("foo".getBytes()));
 		requestSpec.post();
 		OperationRequest request = this.factory
@@ -245,7 +231,7 @@ public void multipartWithByteArrayInputStreamBody() {
 
 	@Test
 	public void multipartWithStringBody() {
-		RequestSpecification requestSpec = RestAssured.given().port(this.port)
+		RequestSpecification requestSpec = RestAssured.given().port(tomcat.getPort())
 				.multiPart("control", "foo");
 		requestSpec.post();
 		OperationRequest request = this.factory
@@ -256,7 +242,7 @@ public void multipartWithStringBody() {
 
 	@Test
 	public void multipartWithByteArrayBody() {
-		RequestSpecification requestSpec = RestAssured.given().port(this.port)
+		RequestSpecification requestSpec = RestAssured.given().port(tomcat.getPort())
 				.multiPart("control", "file", "foo".getBytes());
 		requestSpec.post();
 		OperationRequest request = this.factory
@@ -267,7 +253,7 @@ public void multipartWithByteArrayBody() {
 
 	@Test
 	public void multipartWithFileBody() {
-		RequestSpecification requestSpec = RestAssured.given().port(this.port)
+		RequestSpecification requestSpec = RestAssured.given().port(tomcat.getPort())
 				.multiPart(new File("src/test/resources/body.txt"));
 		requestSpec.post();
 		OperationRequest request = this.factory
@@ -279,7 +265,7 @@ public void multipartWithFileBody() {
 	@Test
 	public void multipartWithFileInputStreamBody() throws FileNotFoundException {
 		FileInputStream inputStream = new FileInputStream("src/test/resources/body.txt");
-		RequestSpecification requestSpec = RestAssured.given().port(this.port)
+		RequestSpecification requestSpec = RestAssured.given().port(tomcat.getPort())
 				.multiPart("foo", "foo.txt", inputStream);
 		requestSpec.post();
 		this.thrown.expect(IllegalStateException.class);
@@ -290,7 +276,7 @@ public void multipartWithFileInputStreamBody() throws FileNotFoundException {
 
 	@Test
 	public void multipartWithObjectBody() {
-		RequestSpecification requestSpec = RestAssured.given().port(this.port)
+		RequestSpecification requestSpec = RestAssured.given().port(tomcat.getPort())
 				.multiPart("control", new ObjectBody("bar"));
 		requestSpec.post();
 		OperationRequest request = this.factory
@@ -299,20 +285,6 @@ public void multipartWithObjectBody() {
 				is(equalTo("{\"foo\":\"bar\"}")));
 	}
 
-	/**
-	 * Minimal test web application.
-	 */
-	@Configuration
-	@EnableAutoConfiguration
-	@RestController
-	static class TestApplication {
-
-		@RequestMapping("/")
-		void handle() {
-		}
-
-	}
-
 	/**
 	 * Sample object body to verify JSON serialization.
 	 */