From a4cd547b7e98f18ff7aeea64180ff9fdaf0e2da0 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 24 May 2019 10:46:50 +0200 Subject: [PATCH] Fix ScriptUtilsUnitTests --- .../datasource/init/ScriptUtilsUnitTests.java | 29 +++++++------------ 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsUnitTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsUnitTests.java index 07c52c1123..7f59218351 100644 --- a/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsUnitTests.java +++ b/spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsUnitTests.java @@ -117,6 +117,16 @@ public class ScriptUtilsUnitTests { @Test public void readAndSplitScriptContainingComments() throws Exception { String script = readScript("test-data-with-comments.sql"); + splitScriptContainingComments(script); + } + + @Test + public void readAndSplitScriptContainingCommentsWithWindowsLineEnding() throws Exception { + String script = readScript("test-data-with-comments.sql").replaceAll("\n", "\r\n"); + splitScriptContainingComments(script); + } + + private void splitScriptContainingComments(String script) throws Exception { List statements = new ArrayList<>(); splitSqlScript(script, ';', statements); @@ -133,25 +143,6 @@ public class ScriptUtilsUnitTests { assertThat(statements.get(3)).as("statement 4 not split correctly").isEqualTo(statement4); } - @Test - public void readAndSplitScriptContainingCommentsWithWindowsLineEnding() throws Exception { - String script = readScript("test-data-with-comments.sql").replaceAll("\n", "\r\n"); - List statements = new ArrayList<>(); - splitSqlScript(script, ';', statements); - - String statement1 = "insert into customer (id, name) values (1, 'Rod; Johnson'), (2, 'Adrian Collier')"; - String statement2 = "insert into orders(id, order_date, customer_id) values (1, '2008-01-02', 2)"; - String statement3 = "insert into orders(id, order_date, customer_id) values (1, '2008-01-02', 2)"; - // Statement 4 addresses the error described in SPR-9982. - String statement4 = "INSERT INTO persons( person_id , name) VALUES( 1 , 'Name' )"; - - assertEquals("wrong number of statements", 4, statements.size()); - assertEquals("statement 1 not split correctly", statement1, statements.get(0)); - assertEquals("statement 2 not split correctly", statement2, statements.get(1)); - assertEquals("statement 3 not split correctly", statement3, statements.get(2)); - assertEquals("statement 4 not split correctly", statement4, statements.get(3)); - } - @Test // SPR-10330 public void readAndSplitScriptContainingCommentsWithLeadingTabs() throws Exception { String script = readScript("test-data-with-comments-and-leading-tabs.sql");