Support custom status code in ExchangeResult for WebTestClient
Prior to this commit, ExchangeResult.assertWithDiagnostics() threw an IllegalArgumentException for a custom HTTP status code since toString() invoked getStatus() without a try-catch block. This commit addresses this issue by introducing a formatStatus() method that defensively formats the response status, initially trying to format the HttpStatus and falling back to formatting the raw integer status code. Closes gh-29283
This commit is contained in:
parent
1c1a0afbed
commit
b20de758b2
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2002-2021 the original author or authors.
|
||||
* Copyright 2002-2022 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.
|
||||
|
|
@ -50,6 +50,7 @@ import org.springframework.util.MultiValueMap;
|
|||
* respectively.
|
||||
*
|
||||
* @author Rossen Stoyanchev
|
||||
* @author Sam Brannen
|
||||
* @since 5.0
|
||||
* @see EntityExchangeResult
|
||||
* @see FluxExchangeResult
|
||||
|
|
@ -171,6 +172,8 @@ public class ExchangeResult {
|
|||
|
||||
/**
|
||||
* Return the HTTP status code as an {@link HttpStatus} enum value.
|
||||
* @throws IllegalArgumentException in case of an unknown HTTP status code
|
||||
* @see #getRawStatusCode()
|
||||
*/
|
||||
public HttpStatus getStatus() {
|
||||
return this.response.getStatusCode();
|
||||
|
|
@ -248,13 +251,22 @@ public class ExchangeResult {
|
|||
"\n" +
|
||||
formatBody(getRequestHeaders().getContentType(), this.requestBody) + "\n" +
|
||||
"\n" +
|
||||
"< " + getStatus() + " " + getStatus().getReasonPhrase() + "\n" +
|
||||
"< " + formatStatus() + "\n" +
|
||||
"< " + formatHeaders(getResponseHeaders(), "\n< ") + "\n" +
|
||||
"\n" +
|
||||
formatBody(getResponseHeaders().getContentType(), this.responseBody) +"\n" +
|
||||
formatMockServerResult();
|
||||
}
|
||||
|
||||
private String formatStatus() {
|
||||
try {
|
||||
return getStatus() + " " + getStatus().getReasonPhrase();
|
||||
}
|
||||
catch (Exception ex) {
|
||||
return Integer.toString(getRawStatusCode());
|
||||
}
|
||||
}
|
||||
|
||||
private String formatHeaders(HttpHeaders headers, String delimiter) {
|
||||
return headers.entrySet().stream()
|
||||
.map(entry -> entry.getKey() + ": " + entry.getValue())
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright 2002-2021 the original author or authors.
|
||||
* Copyright 2002-2022 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.
|
||||
|
|
@ -36,6 +36,7 @@ import static org.mockito.Mockito.mock;
|
|||
* Unit tests for {@link StatusAssertions}.
|
||||
*
|
||||
* @author Rossen Stoyanchev
|
||||
* @author Sam Brannen
|
||||
*/
|
||||
class StatusAssertionTests {
|
||||
|
||||
|
|
@ -56,9 +57,20 @@ class StatusAssertionTests {
|
|||
assertions.isEqualTo(408));
|
||||
}
|
||||
|
||||
@Test // gh-23630
|
||||
@Test // gh-23630, gh-29283
|
||||
void isEqualToWithCustomStatus() {
|
||||
statusAssertions(600).isEqualTo(600);
|
||||
StatusAssertions assertions = statusAssertions(600);
|
||||
|
||||
// Success
|
||||
assertions.isEqualTo(600);
|
||||
|
||||
// Wrong status
|
||||
assertThatExceptionOfType(AssertionError.class).isThrownBy(() ->
|
||||
assertions.isEqualTo(HttpStatus.REQUEST_TIMEOUT));
|
||||
|
||||
// Wrong status value
|
||||
assertThatExceptionOfType(AssertionError.class).isThrownBy(() ->
|
||||
assertions.isEqualTo(408));
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
|
|||
Loading…
Reference in New Issue