spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-22 14:09:25 +00:00
Code Issues Projects Releases Wiki Activity

Simplify tests

Browse Source
This commit is contained in:
Sam Brannen
2026-01-20 17:10:07 +01:00
parent 17e02804ba
commit 5490ba94ae
6 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-web/src/test/java/org/springframework/web/client/RestClientIntegrationTests.java
+4 -2
View File
@@ -406,8 +406,10 @@ class RestClientIntegrationTests {
}
catch (HttpServerErrorException ex) {
assertThat(ex.getStatusCode()).isEqualTo(HttpStatus.INTERNAL_SERVER_ERROR);
assumeFalse(requestFactory instanceof JdkClientHttpRequestFactory, "JDK HttpClient does not expose status text");
assertThat(ex.getStatusText()).isEqualTo("Server Error");
// JDK HttpClient does not expose status text
if (!(requestFactory instanceof JdkClientHttpRequestFactory)) {
assertThat(ex.getStatusText()).isEqualTo("Server Error");
}
assertThat(ex.getResponseHeaders().getContentType()).isEqualTo(MediaType.TEXT_PLAIN);
assertThat(ex.getResponseBodyAsString()).isEqualTo(errorMessage);
}
spring-web/src/test/java/org/springframework/web/client/RestTemplateIntegrationTests.java
+4 -2
View File
@@ -248,8 +248,10 @@ class RestTemplateIntegrationTests extends AbstractMockWebServerTests {
assertThat(ex.getStatusText()).isNotNull();
assertThat(ex.getResponseBodyAsString()).isNotNull();
assertThat(ex.getMessage()).containsSubsequence("404", "on GET request for \"" + url + "\": [no body]");
assumeFalse(clientHttpRequestFactory instanceof JdkClientHttpRequestFactory, "JDK HttpClient does not expose status text");
assertThat(ex.getMessage()).isEqualTo("404 Client Error on GET request for \"" + url + "\": [no body]");
// JDK HttpClient does not expose status text
if (!(clientHttpRequestFactory instanceof JdkClientHttpRequestFactory)) {
assertThat(ex.getMessage()).isEqualTo("404 Client Error on GET request for \"" + url + "\": [no body]");
}
});
}