Browse Source

Test for multi-character delimiter

Issue: SPR-14808
pull/1223/head
Juergen Hoeller 9 years ago
parent
commit
71d83388d4
  1. 30
      spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsUnitTests.java

30
spring-jdbc/src/test/java/org/springframework/jdbc/datasource/init/ScriptUtilsUnitTests.java

@ -86,10 +86,7 @@ public class ScriptUtilsUnitTests {
statements.get(0)); statements.get(0));
} }
/** @Test // SPR-13218
* See <a href="https://jira.spring.io/browse/SPR-13218">SPR-13218</a>
*/
@Test
public void splitScriptWithSingleQuotesNestedInsideDoubleQuotes() throws Exception { public void splitScriptWithSingleQuotesNestedInsideDoubleQuotes() throws Exception {
String statement1 = "select '1' as \"Dogbert's owner's\" from dual"; String statement1 = "select '1' as \"Dogbert's owner's\" from dual";
String statement2 = "select '2' as \"Dilbert's\" from dual"; String statement2 = "select '2' as \"Dilbert's\" from dual";
@ -102,10 +99,7 @@ public class ScriptUtilsUnitTests {
assertEquals("statement 2 not split correctly", statement2, statements.get(1)); assertEquals("statement 2 not split correctly", statement2, statements.get(1));
} }
/** @Test // SPR-11560
* See <a href="https://jira.spring.io/browse/SPR-11560">SPR-11560</a>
*/
@Test
public void readAndSplitScriptWithMultipleNewlinesAsSeparator() throws Exception { public void readAndSplitScriptWithMultipleNewlinesAsSeparator() throws Exception {
String script = readScript("db-test-data-multi-newline.sql"); String script = readScript("db-test-data-multi-newline.sql");
List<String> statements = new ArrayList<>(); List<String> statements = new ArrayList<>();
@ -138,10 +132,7 @@ public class ScriptUtilsUnitTests {
assertEquals("statement 4 not split correctly", statement4, statements.get(3)); assertEquals("statement 4 not split correctly", statement4, statements.get(3));
} }
/** @Test // SPR-10330
* See <a href="https://jira.spring.io/browse/SPR-10330">SPR-10330</a>
*/
@Test
public void readAndSplitScriptContainingCommentsWithLeadingTabs() throws Exception { public void readAndSplitScriptContainingCommentsWithLeadingTabs() throws Exception {
String script = readScript("test-data-with-comments-and-leading-tabs.sql"); String script = readScript("test-data-with-comments-and-leading-tabs.sql");
List<String> statements = new ArrayList<>(); List<String> statements = new ArrayList<>();
@ -157,10 +148,7 @@ public class ScriptUtilsUnitTests {
assertEquals("statement 3 not split correctly", statement3, statements.get(2)); assertEquals("statement 3 not split correctly", statement3, statements.get(2));
} }
/** @Test // SPR-9531
* See <a href="https://jira.spring.io/browse/SPR-9531">SPR-9531</a>
*/
@Test
public void readAndSplitScriptContainingMuliLineComments() throws Exception { public void readAndSplitScriptContainingMuliLineComments() throws Exception {
String script = readScript("test-data-with-multi-line-comments.sql"); String script = readScript("test-data-with-multi-line-comments.sql");
List<String> statements = new ArrayList<>(); List<String> statements = new ArrayList<>();
@ -176,10 +164,12 @@ public class ScriptUtilsUnitTests {
@Test @Test
public void containsDelimiters() { public void containsDelimiters() {
assertTrue("test with ';' is wrong", !containsSqlScriptDelimiters("select 1\n select ';'", ";")); assertFalse(containsSqlScriptDelimiters("select 1\n select ';'", ";"));
assertTrue("test with delimiter ; is wrong", containsSqlScriptDelimiters("select 1; select 2", ";")); assertTrue(containsSqlScriptDelimiters("select 1; select 2", ";"));
assertTrue("test with '\\n' is wrong", !containsSqlScriptDelimiters("select 1; select '\\n\n';", "\n")); assertFalse(containsSqlScriptDelimiters("select 1; select '\\n\n';", "\n"));
assertTrue("test with delimiter \\n is wrong", containsSqlScriptDelimiters("select 1\n select 2", "\n")); assertTrue(containsSqlScriptDelimiters("select 1\n select 2", "\n"));
assertFalse(containsSqlScriptDelimiters("select 1\n select 2", "\n\n"));
assertTrue(containsSqlScriptDelimiters("select 1\n\n select 2", "\n\n"));
} }
private String readScript(String path) throws Exception { private String readScript(String path) throws Exception {

Loading…
Cancel
Save