From b5e4e02337c308d723261660637c4350129efbc9 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Sun, 14 Jul 2019 11:49:11 +0100 Subject: [PATCH] Polish ScriptUtilsUnitTests --- .../datasource/init/ScriptUtilsUnitTests.java | 53 ++++--------------- 1 file changed, 9 insertions(+), 44 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 ae60f813c62..2922bbae4d1 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 @@ -57,10 +57,7 @@ public class ScriptUtilsUnitTests { String script = rawStatement1 + delim + rawStatement2 + delim + rawStatement3 + delim; List statements = new ArrayList<>(); splitSqlScript(script, delim, statements); - assertThat(statements.size()).as("wrong number of statements").isEqualTo(3); - assertThat(statements.get(0)).as("statement 1 not split correctly").isEqualTo(cleanedStatement1); - assertThat(statements.get(1)).as("statement 2 not split correctly").isEqualTo(cleanedStatement2); - assertThat(statements.get(2)).as("statement 3 not split correctly").isEqualTo(cleanedStatement3); + assertThat(statements).containsExactly(cleanedStatement1, cleanedStatement2, cleanedStatement3); } @Test @@ -72,10 +69,7 @@ public class ScriptUtilsUnitTests { String script = statement1 + delim + statement2 + delim + statement3 + delim; List statements = new ArrayList<>(); splitSqlScript(script, delim, statements); - assertThat(statements.size()).as("wrong number of statements").isEqualTo(3); - assertThat(statements.get(0)).as("statement 1 not split correctly").isEqualTo(statement1); - assertThat(statements.get(1)).as("statement 2 not split correctly").isEqualTo(statement2); - assertThat(statements.get(2)).as("statement 3 not split correctly").isEqualTo(statement3); + assertThat(statements).containsExactly(statement1, statement2, statement3); } @Test @@ -86,8 +80,7 @@ public class ScriptUtilsUnitTests { String script = statement1 + delim + statement2 + delim; List statements = new ArrayList<>(); splitSqlScript(script, DEFAULT_STATEMENT_SEPARATOR, statements); - assertThat(statements.size()).as("wrong number of statements").isEqualTo(1); - assertThat(statements.get(0)).as("script should have been 'stripped' but not actually 'split'").isEqualTo(script.replace('\n', ' ')); + assertThat(statements).as("stripped but not split statements").containsExactly(script.replace('\n', ' ')); } @Test // SPR-13218 @@ -98,9 +91,7 @@ public class ScriptUtilsUnitTests { String script = statement1 + delim + statement2 + delim; List statements = new ArrayList<>(); splitSqlScript(script, ';', statements); - assertThat(statements.size()).as("wrong number of statements").isEqualTo(2); - assertThat(statements.get(0)).as("statement 1 not split correctly").isEqualTo(statement1); - assertThat(statements.get(1)).as("statement 2 not split correctly").isEqualTo(statement2); + assertThat(statements).containsExactly(statement1, statement2); } @Test // SPR-11560 @@ -108,13 +99,9 @@ public class ScriptUtilsUnitTests { String script = readScript("db-test-data-multi-newline.sql"); List statements = new ArrayList<>(); splitSqlScript(script, "\n\n", statements); - String statement1 = "insert into T_TEST (NAME) values ('Keith')"; String statement2 = "insert into T_TEST (NAME) values ('Dave')"; - - assertThat(statements.size()).as("wrong number of statements").isEqualTo(2); - assertThat(statements.get(0)).as("statement 1 not split correctly").isEqualTo(statement1); - assertThat(statements.get(1)).as("statement 2 not split correctly").isEqualTo(statement2); + assertThat(statements).containsExactly(statement1, statement2); } @Test @@ -139,18 +126,12 @@ public class ScriptUtilsUnitTests { List statements = new ArrayList<>(); splitSqlScript(null, script, ";", commentPrefixes, DEFAULT_BLOCK_COMMENT_START_DELIMITER, DEFAULT_BLOCK_COMMENT_END_DELIMITER, 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' )"; - - assertThat(statements.size()).as("wrong number of statements").isEqualTo(4); - assertThat(statements.get(0)).as("statement 1 not split correctly").isEqualTo(statement1); - assertThat(statements.get(1)).as("statement 2 not split correctly").isEqualTo(statement2); - assertThat(statements.get(2)).as("statement 3 not split correctly").isEqualTo(statement3); - assertThat(statements.get(3)).as("statement 4 not split correctly").isEqualTo(statement4); + assertThat(statements).containsExactly(statement1, statement2, statement3, statement4); } @Test // SPR-10330 @@ -158,15 +139,10 @@ public class ScriptUtilsUnitTests { String script = readScript("test-data-with-comments-and-leading-tabs.sql"); List statements = new ArrayList<>(); splitSqlScript(script, ';', statements); - String statement1 = "insert into customer (id, name) values (1, 'Sam Brannen')"; String statement2 = "insert into orders(id, order_date, customer_id) values (1, '2013-06-08', 1)"; String statement3 = "insert into orders(id, order_date, customer_id) values (2, '2013-06-08', 1)"; - - assertThat(statements.size()).as("wrong number of statements").isEqualTo(3); - assertThat(statements.get(0)).as("statement 1 not split correctly").isEqualTo(statement1); - assertThat(statements.get(1)).as("statement 2 not split correctly").isEqualTo(statement2); - assertThat(statements.get(2)).as("statement 3 not split correctly").isEqualTo(statement3); + assertThat(statements).containsExactly(statement1, statement2, statement3); } @Test // SPR-9531 @@ -174,13 +150,9 @@ public class ScriptUtilsUnitTests { String script = readScript("test-data-with-multi-line-comments.sql"); List statements = new ArrayList<>(); splitSqlScript(script, ';', statements); - String statement1 = "INSERT INTO users(first_name, last_name) VALUES('Juergen', 'Hoeller')"; String statement2 = "INSERT INTO users(first_name, last_name) VALUES( 'Sam' , 'Brannen' )"; - - assertThat(statements.size()).as("wrong number of statements").isEqualTo(2); - assertThat(statements.get(0)).as("statement 1 not split correctly").isEqualTo(statement1); - assertThat(statements.get(1)).as("statement 2 not split correctly").isEqualTo(statement2); + assertThat(statements).containsExactly(statement1, statement2); } @Test @@ -188,26 +160,19 @@ public class ScriptUtilsUnitTests { String script = readScript("test-data-with-multi-line-nested-comments.sql"); List statements = new ArrayList<>(); splitSqlScript(script, ';', statements); - String statement1 = "INSERT INTO users(first_name, last_name) VALUES('Juergen', 'Hoeller')"; String statement2 = "INSERT INTO users(first_name, last_name) VALUES( 'Sam' , 'Brannen' )"; - - assertThat(statements.size()).as("wrong number of statements").isEqualTo(2); - assertThat(statements.get(0)).as("statement 1 not split correctly").isEqualTo(statement1); - assertThat(statements.get(1)).as("statement 2 not split correctly").isEqualTo(statement2); + assertThat(statements).containsExactly(statement1, statement2); } @Test public void containsDelimiters() { assertThat(containsSqlScriptDelimiters("select 1\n select ';'", ";")).isFalse(); assertThat(containsSqlScriptDelimiters("select 1; select 2", ";")).isTrue(); - assertThat(containsSqlScriptDelimiters("select 1; select '\\n\n';", "\n")).isFalse(); assertThat(containsSqlScriptDelimiters("select 1\n select 2", "\n")).isTrue(); - assertThat(containsSqlScriptDelimiters("select 1\n select 2", "\n\n")).isFalse(); assertThat(containsSqlScriptDelimiters("select 1\n\n select 2", "\n\n")).isTrue(); - // MySQL style escapes '\\' assertThat(containsSqlScriptDelimiters("insert into users(first_name, last_name)\nvalues('a\\\\', 'b;')", ";")).isFalse(); assertThat(containsSqlScriptDelimiters("insert into users(first_name, last_name)\nvalues('Charles', 'd\\'Artagnan'); select 1;", ";")).isTrue();