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

Merge branch '5.3.x'

Browse Source
This commit is contained in:
Sam Brannen
2022-01-10 14:21:25 +01:00
parent 4ebc53a424 df263d01b9
commit d57bc176f2
72 changed files with 334 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-web/src/test/java/org/springframework/web/context/request/ServletWebRequestHttpMethodsTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2022 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.
@@ -323,7 +323,7 @@ class ServletWebRequestHttpMethodsTests {
assertThat(request.checkNotModified(oneMinuteAgo)).isFalse();
assertThat(servletResponse.getStatus()).isEqualTo(200);
assertThat(servletResponse.getHeader("Last-Modified")).isEqualTo(null);
assertThat(servletResponse.getHeader("Last-Modified")).isNull();
}
@ParameterizedHttpMethodTest
@@ -337,7 +337,7 @@ class ServletWebRequestHttpMethodsTests {
assertThat(request.checkNotModified(currentEpoch)).isTrue();
assertThat(servletResponse.getStatus()).isEqualTo(412);
assertThat(servletResponse.getHeader("Last-Modified")).isEqualTo(null);
assertThat(servletResponse.getHeader("Last-Modified")).isNull();
}
private void setUpRequest(String method) {

6
spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2021 the original author or authors.
* Copyright 2002-2022 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.
@@ -1073,7 +1073,7 @@ class UriComponentsBuilderTests {
assertThat(result1.getPath()).isEqualTo("/p1/%s/%s", vars.get("ps1"), vars.get("ps2"));
assertThat(result1.getQuery()).isEqualTo("q1");
assertThat(result1.getFragment()).isEqualTo("f1");
assertThat(result1.getSchemeSpecificPart()).isEqualTo(null);
assertThat(result1.getSchemeSpecificPart()).isNull();
UriComponents result2 = builder2.build();
assertThat(result2.getScheme()).isEqualTo("http");
@@ -1082,7 +1082,7 @@ class UriComponentsBuilderTests {
assertThat(result2.getPath()).isEqualTo("/p1/%s/%s", vars.get("ps1"), vars.get("ps2"));
assertThat(result2.getQuery()).isEqualTo("q1");
assertThat(result2.getFragment()).isEqualTo("f1");
assertThat(result1.getSchemeSpecificPart()).isEqualTo(null);
assertThat(result1.getSchemeSpecificPart()).isNull();
}
@Test // gh-26466