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

Raise the minimum support version of Spring Framework to 7.0

Browse Source 
See gh-955
This commit is contained in:
Stéphane Nicoll
2025-01-13 13:33:40 +01:00
committed by Andy Wilkinson
parent db16f279c2
commit c72e32d3cb
22 changed files with 99 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-restdocs-webtestclient/src/main/java/org/springframework/restdocs/webtestclient/WebTestClientResponseConverter.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2023 the original author or authors.
* Copyright 2014-2025 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.
@@ -46,7 +46,7 @@ class WebTestClientResponseConverter implements ResponseConverter<ExchangeResult
private HttpHeaders extractHeaders(ExchangeResult result) {
HttpHeaders headers = result.getResponseHeaders();
if (result.getResponseCookies().isEmpty() || headers.containsKey(HttpHeaders.SET_COOKIE)) {
if (result.getResponseCookies().isEmpty() || headers.containsHeader(HttpHeaders.SET_COOKIE)) {
return headers;
}
result.getResponseCookies()

11
spring-restdocs-webtestclient/src/test/java/org/springframework/restdocs/webtestclient/WebTestClientRequestConverterTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2024 the original author or authors.
* Copyright 2014-2025 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.
@@ -39,6 +39,7 @@ import org.springframework.web.reactive.function.server.RouterFunctions;
import org.springframework.web.reactive.function.server.ServerResponse;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.entry;
import static org.springframework.web.reactive.function.server.RequestPredicates.GET;
import static org.springframework.web.reactive.function.server.RequestPredicates.POST;
@@ -99,8 +100,8 @@ public class WebTestClientRequestConverterTests {
OperationRequest request = this.converter.convert(result);
assertThat(request.getUri()).isEqualTo(URI.create("http://localhost/foo"));
assertThat(request.getMethod()).isEqualTo(HttpMethod.GET);
assertThat(request.getHeaders()).containsEntry("a", Arrays.asList("alpha", "apple"));
assertThat(request.getHeaders()).containsEntry("b", Arrays.asList("bravo"));
assertThat(request.getHeaders().headerSet()).contains(entry("a", Arrays.asList("alpha", "apple")),
entry("b", Arrays.asList("bravo")));
}
@Test
@@ -266,7 +267,7 @@ public class WebTestClientRequestConverterTests {
OperationRequestPart part = request.getParts().iterator().next();
assertThat(part.getName()).isEqualTo("file");
assertThat(part.getSubmittedFileName()).isNull();
assertThat(part.getHeaders()).hasSize(2);
assertThat(part.getHeaders().size()).isEqualTo(2);
assertThat(part.getHeaders().getContentLength()).isEqualTo(4L);
assertThat(part.getHeaders().getContentDisposition().getName()).isEqualTo("file");
assertThat(part.getContent()).containsExactly(1, 2, 3, 4);
@@ -303,7 +304,7 @@ public class WebTestClientRequestConverterTests {
OperationRequestPart part = request.getParts().iterator().next();
assertThat(part.getName()).isEqualTo("file");
assertThat(part.getSubmittedFileName()).isEqualTo("image.png");
assertThat(part.getHeaders()).hasSize(3);
assertThat(part.getHeaders().size()).isEqualTo(3);
assertThat(part.getHeaders().getContentLength()).isEqualTo(4);
ContentDisposition contentDisposition = part.getHeaders().getContentDisposition();
assertThat(contentDisposition.getName()).isEqualTo("file");

8
spring-restdocs-webtestclient/src/test/java/org/springframework/restdocs/webtestclient/WebTestClientResponseConverterTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2014-2023 the original author or authors.
* Copyright 2014-2025 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.
@@ -32,6 +32,7 @@ import org.springframework.web.reactive.function.server.RouterFunctions;
import org.springframework.web.reactive.function.server.ServerResponse;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.entry;
import static org.springframework.web.reactive.function.server.RequestPredicates.GET;
/**
@@ -83,9 +84,8 @@ public class WebTestClientResponseConverterTests {
.expectBody()
.returnResult();
OperationResponse response = this.converter.convert(result);
assertThat(response.getHeaders()).hasSize(1);
assertThat(response.getHeaders()).containsEntry(HttpHeaders.SET_COOKIE,
Collections.singletonList("name=value; Domain=localhost; HttpOnly"));
assertThat(response.getHeaders().headerSet()).containsOnly(
entry(HttpHeaders.SET_COOKIE, Collections.singletonList("name=value; Domain=localhost; HttpOnly")));
assertThat(response.getCookies()).hasSize(1);
assertThat(response.getCookies()).first().extracting(ResponseCookie::getName).isEqualTo("name");
assertThat(response.getCookies()).first().extracting(ResponseCookie::getValue).isEqualTo("value");