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

Merge branch '7.0.x'

Browse Source
This commit is contained in:
Sam Brannen
2026-06-08 18:29:20 +02:00
parent 4e39c28b92 2c18c33ce0
commit 2b08e6e1d3
64 changed files with 1187 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-web/src/test/java/org/springframework/web/util/JavaScriptUtilsTests.java
+10
View File
@@ -62,4 +62,14 @@ class JavaScriptUtilsTests {
assertThat(JavaScriptUtils.javaScriptEscape("<>")).isEqualTo("\\u003C\\u003E");
}
@Test
void escapeBacktick() {
assertThat(JavaScriptUtils.javaScriptEscape("`")).isEqualTo("\\u0060");
}
@Test
void escapeDollar() {
assertThat(JavaScriptUtils.javaScriptEscape("$")).isEqualTo("\\u0024");
}
}
spring-web/src/test/java/org/springframework/web/util/UriComponentsBuilderTests.java
+4 -1
View File
@@ -267,7 +267,10 @@ class UriComponentsBuilderTests {
@EnumSource
void fromUriStringInvalidIPv6Host(ParserType parserType) {
assertThatIllegalArgumentException().isThrownBy(() ->
UriComponentsBuilder.fromUriString("http://[1abc:2abc:3abc::5ABC:6abc:8080/resource", parserType));
UriComponentsBuilder.fromUriString("https://[1abc:2abc:3abc::5ABC:6abc:8080/resource", parserType));
assertThatIllegalArgumentException().isThrownBy(() ->
UriComponentsBuilder.fromUriString("https://[1abc:2abc:3abc::5ABC:6abc]resource", parserType));
}
@ParameterizedTest // gh-36759