Use new features in JUnit Jupiter 5.8.2

See gh-27744
spring-projects · Nov 30, 2021 · a0d5410 · a0d5410
1 parent 44950bb
commit a0d5410
Showing 1 changed file with 37 additions and 31 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
@@ -200,37 +200,43 @@ public void readAndSplitScriptContainingMultiLineNestedComments() throws Excepti
 	}
 
 	@ParameterizedTest
-	@CsvSource(delimiter = '#', value = {
-		// semicolon
-		"'select 1\n select '';'''                                                          # ;      # false",
-		"'select 1\n select \";\"'                                                          # ;      # false",
-		"'select 1; select 2'                                                               # ;      # true",
-		// newline
-		"'select 1; select ''\n'''                                                          # '\n'   # false",
-		"'select 1; select \"\n\"'                                                          # '\n'   # false",
-		"'select 1\n select 2'                                                              # '\n'   # true",
-		// double newline
-		"'select 1\n select 2'                                                              # '\n\n' # false",
-		"'select 1\n\n select 2'                                                            # '\n\n' # true",
-		// semicolon with MySQL style escapes '\\'
-		"'insert into users(first, last)\nvalues(''a\\\\'', ''b;'')'                        # ;      # false",
-		"'insert into users(first, last)\nvalues(''Charles'', ''d\\''Artagnan''); select 1' # ;      # true",
-		// semicolon inside comments
-		"'-- a;b;c\ninsert into colors(color_num) values(42);'                              # ;      # true",
-		"'/* a;b;c */\ninsert into colors(color_num) values(42);'                           # ;      # true",
-		"'-- a;b;c\ninsert into colors(color_num) values(42)'                               # ;      # false",
-		"'/* a;b;c */\ninsert into colors(color_num) values(42)'                            # ;      # false",
-		// single quotes inside comments
-		"'-- What\\''s your favorite color?\ninsert into colors(color_num) values(42);'     # ;      # true",
-		"'-- What''s your favorite color?\ninsert into colors(color_num) values(42);'       # ;      # true",
-		"'/* What\\''s your favorite color? */\ninsert into colors(color_num) values(42);'  # ;      # true",
-		"'/* What''s your favorite color? */\ninsert into colors(color_num) values(42);'    # ;      # true",
-		// double quotes inside comments
-		"'-- double \" quotes\ninsert into colors(color_num) values(42);'                   # ;      # true",
-		"'-- double \\\" quotes\ninsert into colors(color_num) values(42);'                 # ;      # true",
-		"'/* double \" quotes */\ninsert into colors(color_num) values(42);'                # ;      # true",
-		"'/* double \\\" quotes */\ninsert into colors(color_num) values(42);'              # ;      # true"
-	})
+	@CsvSource(delimiter = '|', quoteCharacter = '~', textBlock = """
+		# semicolon
+		~select 1\n select ';'~                                                            | ;      | false
+		~select 1\n select ";"~                                                            | ;      | false
+		~select 1; select 2~                                                               | ;      | true
+
+		# newline
+		~select 1; select '\n'~                                                            | ~\n~   | false
+		~select 1; select "\n"~                                                            | ~\n~   | false
+		~select 1\n select 2~                                                              | ~\n~   | true
+
+		# double newline
+		~select 1\n select 2~                                                              | ~\n\n~ | false
+		~select 1\n\n select 2~                                                            | ~\n\n~ | true
+
+		# semicolon with MySQL style escapes '\\'
+		~insert into users(first, last)\n values('a\\\\', 'b;')~                           | ;      | false
+		~insert into users(first, last)\n values('Charles', 'd\\'Artagnan'); select 1~     | ;      | true
+
+		# semicolon inside comments
+		~-- a;b;c\n insert into colors(color_num) values(42);~                             | ;      | true
+		~/* a;b;c */\n insert into colors(color_num) values(42);~                          | ;      | true
+		~-- a;b;c\n insert into colors(color_num) values(42)~                              | ;      | false
+		~/* a;b;c */\n insert into colors(color_num) values(42)~                           | ;      | false
+
+		# single quotes inside comments
+		~-- What\\'s your favorite color?\n insert into colors(color_num) values(42);~     | ;      | true
+		~-- What's your favorite color?\n insert into colors(color_num) values(42);~       | ;      | true
+		~/* What\\'s your favorite color? */\n insert into colors(color_num) values(42);~  | ;      | true
+		~/* What's your favorite color? */\n insert into colors(color_num) values(42);~    | ;      | true
+
+		# double quotes inside comments
+		~-- double " quotes\n insert into colors(color_num) values(42);~                   | ;      | true
+		~-- double \\" quotes\n insert into colors(color_num) values(42);~                 | ;      | true
+		~/* double " quotes */\n insert into colors(color_num) values(42);~                | ;      | true
+		~/* double \\" quotes */\n insert into colors(color_num) values(42);~              | ;      | true
+		""")
 	@SuppressWarnings("deprecation")
 	public void containsStatementSeparator(String script, String delimiter, boolean expected) {
 		// Indirectly tests ScriptUtils.containsStatementSeparator(EncodedResource, String, String, String[], String, String).