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

Use Framework's HttpStatusCode to model response's status

Browse Source 
Closes gh-848
This commit is contained in:
Andy Wilkinson
2022-10-12 11:26:01 +01:00
parent b107d0e8ed
commit 03b61ab075
20 changed files with 58 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-restdocs-restassured/src/main/java/org/springframework/restdocs/restassured/RestAssuredResponseConverter.java
View File

@@ -26,6 +26,7 @@ import io.restassured.http.Header;
import io.restassured.response.Response;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatusCode;
import org.springframework.restdocs.operation.OperationResponse;
import org.springframework.restdocs.operation.OperationResponseFactory;
import org.springframework.restdocs.operation.ResponseConverter;
@@ -44,8 +45,8 @@ class RestAssuredResponseConverter implements ResponseConverter<Response> {
public OperationResponse convert(Response response) {
HttpHeaders headers = extractHeaders(response);
Collection<ResponseCookie> cookies = extractCookies(response, headers);
return new OperationResponseFactory().create(response.getStatusCode(), extractHeaders(response),
extractContent(response), cookies);
return new OperationResponseFactory().create(HttpStatusCode.valueOf(response.getStatusCode()),
extractHeaders(response), extractContent(response), cookies);
}
private Collection<ResponseCookie> extractCookies(Response response, HttpHeaders headers) {

4
spring-restdocs-restassured/src/test/java/org/springframework/restdocs/restassured/RestAssuredResponseConverterTests.java
View File

@@ -21,6 +21,7 @@ import io.restassured.response.Response;
import io.restassured.response.ResponseBody;
import org.junit.Test;
import org.springframework.http.HttpStatusCode;
import org.springframework.restdocs.operation.OperationResponse;
import static org.assertj.core.api.Assertions.assertThat;
@@ -45,8 +46,7 @@ public class RestAssuredResponseConverterTests {
given(response.getBody()).willReturn(body);
given(body.asByteArray()).willReturn(new byte[0]);
OperationResponse operationResponse = this.converter.convert(response);
assertThat(operationResponse.getStatus()).isNull();
assertThat(operationResponse.getStatusCode()).isEqualTo(600);
assertThat(operationResponse.getStatus()).isEqualTo(HttpStatusCode.valueOf(600));
}
}