root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '6.0.x'

This commit is contained in:
Sébastien Deleuze 2023-10-24 17:55:32 +02:00
parent 1022e090e7 7874a59771
commit a71eb3fb08
2 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spring-web/src/test/java/org/springframework/web/client/RestClientIntegrationTests.java
View File

@ -701,18 +701,6 @@ class RestClientIntegrationTests {
} }
@ParameterizedRestClientTest
void invalidDomain(ClientHttpRequestFactory requestFactory) {
startServer(requestFactory);
String url = "http://example.invalid";
assertThatExceptionOfType(ResourceAccessException.class).isThrownBy(() ->
this.restClient.get().uri(url).retrieve().toBodilessEntity()
);
}
private void prepareResponse(Consumer<MockResponse> consumer) { private void prepareResponse(Consumer<MockResponse> consumer) {
MockResponse response = new MockResponse(); MockResponse response = new MockResponse();
consumer.accept(response); consumer.accept(response);

17
spring-webflux/src/test/java/org/springframework/web/reactive/function/client/WebClientIntegrationTests.java
View File

@ -1198,23 +1198,6 @@ class WebClientIntegrationTests {
expectRequestCount(1); expectRequestCount(1);
} }
@ParameterizedWebClientTest
void invalidDomain(ClientHttpConnector connector) {
startServer(connector);
String url = "http://example.invalid";
Mono<Void> result = this.webClient.get().uri(url).retrieve().bodyToMono(Void.class);
StepVerifier.create(result)
.expectErrorSatisfies(throwable -> {
assertThat(throwable).isInstanceOf(WebClientRequestException.class);
WebClientRequestException ex = (WebClientRequestException) throwable;
assertThat(ex.getMethod()).isEqualTo(HttpMethod.GET);
assertThat(ex.getUri()).isEqualTo(URI.create(url));
})
.verify();
}
@ParameterizedWebClientTest @ParameterizedWebClientTest
void malformedResponseChunksOnBodilessEntity(ClientHttpConnector connector) { void malformedResponseChunksOnBodilessEntity(ClientHttpConnector connector) {
Mono<?> result = doMalformedChunkedResponseTest(connector, ResponseSpec::toBodilessEntity); Mono<?> result = doMalformedChunkedResponseTest(connector, ResponseSpec::toBodilessEntity);