Spring/spring-restdocs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Introduce RequestCookie to avoid core depending on the Servlet API

Browse Source 
Closes gh-345
This commit is contained in:
Andy Wilkinson
2017-02-03 14:53:54 +00:00
parent ccb31ecfb2
commit 722048e20f
15 changed files with 111 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-restdocs-restassured/src/main/java/org/springframework/restdocs/restassured/RestAssuredRequestConverter.java
View File

@@ -39,6 +39,7 @@ import org.springframework.restdocs.operation.OperationRequestPart;
import org.springframework.restdocs.operation.OperationRequestPartFactory;
import org.springframework.restdocs.operation.Parameters;
import org.springframework.restdocs.operation.RequestConverter;
import org.springframework.restdocs.operation.RequestCookie;
import org.springframework.util.FileCopyUtils;
import org.springframework.util.StreamUtils;
@@ -60,12 +61,11 @@ class RestAssuredRequestConverter
extractCookies(requestSpec));
}
private Collection<javax.servlet.http.Cookie> extractCookies(
private Collection<RequestCookie> extractCookies(
FilterableRequestSpecification requestSpec) {
Collection<javax.servlet.http.Cookie> cookies = new ArrayList<>();
Collection<RequestCookie> cookies = new ArrayList<>();
for (Cookie cookie : requestSpec.getCookies()) {
cookies.add(
new javax.servlet.http.Cookie(cookie.getName(), cookie.getValue()));
cookies.add(new RequestCookie(cookie.getName(), cookie.getValue()));
}
return cookies;
}

9
spring-restdocs-restassured/src/test/java/org/springframework/restdocs/restassured/RestAssuredRequestConverterTests.java
View File

@@ -25,8 +25,6 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Iterator;
import javax.servlet.http.Cookie;
import com.jayway.restassured.RestAssured;
import com.jayway.restassured.specification.FilterableRequestSpecification;
import com.jayway.restassured.specification.RequestSpecification;
@@ -44,6 +42,7 @@ 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.operation.RequestCookie;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -154,13 +153,13 @@ public class RestAssuredRequestConverterTests {
.convert((FilterableRequestSpecification) requestSpec);
assertThat(request.getCookies().size(), is(equalTo(2)));
Iterator<Cookie> cookieIterator = request.getCookies().iterator();
Cookie cookie1 = cookieIterator.next();
Iterator<RequestCookie> cookieIterator = request.getCookies().iterator();
RequestCookie cookie1 = cookieIterator.next();
assertThat(cookie1.getName(), is(equalTo("cookie1")));
assertThat(cookie1.getValue(), is(equalTo("cookieVal1")));
Cookie cookie2 = cookieIterator.next();
RequestCookie cookie2 = cookieIterator.next();
assertThat(cookie2.getName(), is(equalTo("cookie2")));
assertThat(cookie2.getValue(), is(equalTo("cookieVal2")));
}