Skip to content

Commit c613755

Browse files
committed
Convert quoted text tests to parameterized tests
1 parent 99380e0 commit c613755

File tree

1 file changed

+35
-36
lines changed

1 file changed

+35
-36
lines changed

jupiter-tests/src/test/java/org/junit/jupiter/params/ParameterizedInvocationNameFormatterTests.java

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -330,48 +330,47 @@ void mixedTypesOfArgumentsImplementationsAndCustomDisplayNamePattern() {
330330
@Nested
331331
class QuotedTextTests {
332332

333-
@Test
334-
void quotedStrings() {
333+
@ParameterizedTest
334+
@CsvSource(delimiterString = "->", textBlock = """
335+
'Jane Smith' -> 'Jane Smith'
336+
\\ -> \\\\
337+
" -> \\"
338+
# The following represents a single ' enclosed in ''.
339+
'''' -> ''''
340+
'\n' -> \\n
341+
'\r\n' -> \\r\\n
342+
' \t ' -> ' \\t '
343+
'\b' -> \\b
344+
'\f' -> \\f
345+
'\u0007' -> ?
346+
""")
347+
void quotedStrings(String argument, String expected) {
335348
var formatter = formatter(DEFAULT_DISPLAY_NAME, "IGNORED");
336349

337-
var formattedName = format(formatter, 1,
338-
arguments("Jane Smith", "\\", "\"", "'", "\n", "\r\n", " \t ", "\b", "\f", "\u0007"));
339-
340-
assertThat(formattedName).isEqualTo("""
341-
[1] \
342-
"Jane Smith", \
343-
"\\\\", \
344-
"\\"", \
345-
"'", \
346-
"\\n", \
347-
"\\r\\n", \
348-
" \\t ", \
349-
"\\b", \
350-
"\\f", \
351-
"?"\
352-
""");
350+
var formattedName = format(formatter, 1, arguments(argument));
351+
assertThat(formattedName).isEqualTo("[1] " + '"' + expected + '"');
353352
}
354353

355-
@Test
356-
void quotedCharacters() {
354+
@ParameterizedTest
355+
@CsvSource(quoteCharacter = '"', delimiterString = "->", textBlock = """
356+
X -> X
357+
\\ -> \\\\
358+
' -> \\'
359+
# The following represents a single " enclosed in "". The escaping is
360+
# necessary, because three " characters in a row close the text block.
361+
\"""\" -> \"""\"
362+
"\n" -> \\n
363+
"\r" -> \\r
364+
"\t" -> \\t
365+
"\b" -> \\b
366+
"\f" -> \\f
367+
"\u0007" -> ?
368+
""")
369+
void quotedCharacters(char argument, String expected) {
357370
var formatter = formatter(DEFAULT_DISPLAY_NAME, "IGNORED");
358371

359-
var formattedName = format(formatter, 1,
360-
arguments('X', '\\', '\'', '"', '\r', '\n', '\t', '\b', '\f', '\u0007'));
361-
362-
assertThat(formattedName).isEqualTo("""
363-
[1] \
364-
'X', \
365-
'\\\\', \
366-
'\\'', \
367-
'"', \
368-
'\\r', \
369-
'\\n', \
370-
'\\t', \
371-
'\\b', \
372-
'\\f', \
373-
'?'\
374-
""");
372+
var formattedName = format(formatter, 1, arguments(argument));
373+
assertThat(formattedName).isEqualTo("[1] " + "'" + expected + "'");
375374
}
376375

377376
@Test

0 commit comments

Comments
 (0)