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

Polish

Browse Source
This commit is contained in:
Stéphane Nicoll
2024-01-15 11:17:11 +01:00
parent e1236a8672
commit 0c42965fc3
71 changed files with 543 additions and 828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-test/src/test/java/org/springframework/mock/web/MockHttpServletResponseTests.java
View File

@@ -259,13 +259,11 @@ class MockHttpServletResponseTests {
}
@Test
void httpHeaderNameCasingIsPreserved() throws Exception {
void httpHeaderNameCasingIsPreserved() {
final String headerName = "Header1";
response.addHeader(headerName, "value1");
Collection<String> responseHeaders = response.getHeaderNames();
assertThat(responseHeaders).isNotNull();
assertThat(responseHeaders).hasSize(1);
assertThat(responseHeaders).element(0).as("HTTP header casing not being preserved").isEqualTo(headerName);
assertThat(responseHeaders).containsExactly(headerName);
}
@Test
@@ -400,8 +398,8 @@ class MockHttpServletResponseTests {
void addDateHeader() {
response.addDateHeader(LAST_MODIFIED, 1437472800000L);
response.addDateHeader(LAST_MODIFIED, 1437472801000L);
assertThat(response.getHeaders(LAST_MODIFIED)).element(0).isEqualTo("Tue, 21 Jul 2015 10:00:00 GMT");
assertThat(response.getHeaders(LAST_MODIFIED)).element(1).isEqualTo("Tue, 21 Jul 2015 10:00:01 GMT");
assertThat(response.getHeaders(LAST_MODIFIED)).containsExactly(
"Tue, 21 Jul 2015 10:00:00 GMT", "Tue, 21 Jul 2015 10:00:01 GMT");
}
@Test

14
spring-test/src/test/java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java
View File

@@ -366,8 +366,7 @@ class MockHttpServletRequestBuilderTests {
List<String> contentTypes = Collections.list(request.getHeaders("Content-Type"));
assertThat(contentType).isEqualTo("text/html");
assertThat(contentTypes).hasSize(1);
assertThat(contentTypes).element(0).isEqualTo("text/html");
assertThat(contentTypes).containsExactly("text/html");
}
@Test
@@ -379,8 +378,7 @@ class MockHttpServletRequestBuilderTests {
List<String> contentTypes = Collections.list(request.getHeaders("Content-Type"));
assertThat(contentType).isEqualTo("text/html");
assertThat(contentTypes).hasSize(1);
assertThat(contentTypes).element(0).isEqualTo("text/html");
assertThat(contentTypes).containsExactly("text/html");
}
@Test // gh-2079
@@ -433,9 +431,7 @@ class MockHttpServletRequestBuilderTests {
MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
List<String> headers = Collections.list(request.getHeaders("foo"));
assertThat(headers).hasSize(2);
assertThat(headers).element(0).isEqualTo("bar");
assertThat(headers).element(1).isEqualTo("baz");
assertThat(headers).containsExactly("bar", "baz");
}
@Test
@@ -448,9 +444,7 @@ class MockHttpServletRequestBuilderTests {
MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);
List<String> headers = Collections.list(request.getHeaders("foo"));
assertThat(headers).hasSize(2);
assertThat(headers).element(0).isEqualTo("bar");
assertThat(headers).element(1).isEqualTo("baz");
assertThat(headers).containsExactly("bar", "baz");
assertThat(request.getHeader("Content-Type")).isEqualTo(MediaType.APPLICATION_JSON.toString());
}

7
spring-test/src/test/java/org/springframework/test/web/servlet/result/PrintingResultHandlerTests.java
View File

@@ -167,10 +167,9 @@ class PrintingResultHandlerTests {
// Manually validate cookie values since maxAge changes...
List<String> cookieValues = this.response.getHeaders("Set-Cookie");
assertThat(cookieValues).hasSize(2);
assertThat(cookieValues).element(0).isEqualTo("cookie=cookieValue");
assertThat(cookieValues).element(1).asString().as("Actual: " + cookieValues.get(1))
.startsWith("enigma=42; Path=/crumbs; Domain=.example.com; Max-Age=1234; Expires=");
assertThat(cookieValues).satisfiesExactly(
zero -> assertThat(zero).isEqualTo("cookie=cookieValue"),
one -> assertThat(one).startsWith("enigma=42; Path=/crumbs; Domain=.example.com; Max-Age=1234; Expires="));
HttpHeaders headers = new HttpHeaders();
headers.set("header", "headerValue");