spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-09-17 08:24:13 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '7.0.x'

Browse Source
This commit is contained in:
Sam Brannen
2026-08-31 17:17:01 +02:00
parent bc66622342 dcc24a2325
commit ee19b96ee9
4 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-test/src/main/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnection.java
+1 -1
View File
@@ -181,7 +181,7 @@ public final class MockMvcWebConnection implements WebConnection {
private static Cookie createCookie(jakarta.servlet.http.Cookie cookie) {
Date expires = null;
if (cookie.getMaxAge() > -1) {
expires = new Date(System.currentTimeMillis() + cookie.getMaxAge() * 1000);
expires = new Date(System.currentTimeMillis() + cookie.getMaxAge() * 1000L);
}
return new Cookie(cookie.getDomain(), cookie.getName(), cookie.getValue(), cookie.getPath(),
expires, cookie.getSecure(), cookie.isHttpOnly());
spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebClientBuilderTests.java
+20
View File
@@ -109,6 +109,17 @@ class MockMvcWebClientBuilderTests {
assertThat(getResponse(client, "http://localhost/").getContentAsString()).isEqualTo("NA");
}
@Test
void cookieWithLargeMaxAgeIsStored() throws Exception {
this.mockMvc = MockMvcBuilders.standaloneSetup(new CookieController()).build();
WebClient client = MockMvcWebClientBuilder.mockMvcSetup(this.mockMvc).build();
assertThat(getResponse(client, "http://localhost/").getContentAsString()).isEqualTo("NA");
assertThat(postResponse(client, "http://localhost/long-lived", "cookie=foo")
.getContentAsString()).isEqualTo("Set");
assertThat(getResponse(client, "http://localhost/").getContentAsString()).isEqualTo("foo");
}
private void assertMockMvcUsed(WebClient client, String url) throws Exception {
assertThat(getResponse(client, url).getContentAsString()).isEqualTo("mvc");
}
@@ -162,6 +173,15 @@ class MockMvcWebClientBuilderTests {
return "Set";
}
@PostMapping(path = "/long-lived", produces = "text/plain")
String setLongLivedCookie(@RequestParam String cookie, HttpServletResponse response) {
jakarta.servlet.http.Cookie longLived = new jakarta.servlet.http.Cookie(COOKIE_NAME, cookie);
longLived.setMaxAge(Integer.MAX_VALUE);
longLived.setPath("/");
response.addCookie(longLived);
return "Set";
}
@DeleteMapping(path = "/", produces = "text/plain")
String deleteCookie(HttpServletResponse response) {
jakarta.servlet.http.Cookie cookie = new jakarta.servlet.http.Cookie(COOKIE_NAME, "");