From 39ff8e46abea6fa67c11e1e5e5e1f7f544ce6dbf Mon Sep 17 00:00:00 2001 From: Sam Brannen <104798+sbrannen@users.noreply.github.com> Date: Sun, 3 May 2026 14:36:23 +0200 Subject: [PATCH] Use String#replace instead of String#replaceAll in tests See gh-36678 --- .../springframework/jdbc/datasource/init/ScriptUtilsTests.java | 2 +- .../springframework/r2dbc/connection/init/ScriptUtilsTests.java | 2 +- .../client/standalone/resultmatches/XpathAssertionTests.java | 2 +- .../samples/standalone/resultmatchers/XpathAssertionTests.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsTests.java index 4b8a057096f..d79411efaa4 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsTests.java @@ -129,7 +129,7 @@ class ScriptUtilsTests { @Test void readAndSplitScriptContainingCommentsWithWindowsLineEnding() throws Exception { - String script = readScript("test-data-with-comments.sql").replaceAll("\n", "\r\n"); + String script = readScript("test-data-with-comments.sql").replace("\n", "\r\n"); splitScriptContainingComments(script, DEFAULT_COMMENT_PREFIXES); } diff --git a/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/init/ScriptUtilsTests.java b/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/init/ScriptUtilsTests.java index 774341099b8..09fde89dedd 100644 --- a/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/init/ScriptUtilsTests.java +++ b/spring-r2dbc/src/test/java/org/springframework/r2dbc/connection/init/ScriptUtilsTests.java @@ -121,7 +121,7 @@ class ScriptUtilsTests { @Test void readAndSplitScriptContainingCommentsWithWindowsLineEnding() { - String script = readScript("test-data-with-comments.sql").replaceAll("\n", "\r\n"); + String script = readScript("test-data-with-comments.sql").replace("\n", "\r\n"); splitScriptContainingComments(script, DEFAULT_COMMENT_PREFIXES); } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/XpathAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/XpathAssertionTests.java index 073ef9329bd..19de697b3d9 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/XpathAssertionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/client/standalone/resultmatches/XpathAssertionTests.java @@ -232,7 +232,7 @@ class XpathAssertionTests { Test Feed https://www.example.com/favicon.ico - """.replaceAll("\n", "\r\n"); + """.replace("\n", "\r\n"); } } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java index 58e0d336e4c..bf23af0c649 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/resultmatchers/XpathAssertionTests.java @@ -232,7 +232,7 @@ class XpathAssertionTests { Test Feed https://www.example.com/favicon.ico - """.replaceAll("\n", "\r\n"); + """.replace("\n", "\r\n"); } }