Merge some string literals

Author: garydgregory

src/test/java/org/apache/commons/csv/CSVFormatTest.java

@@ -1218,7 +1218,7 @@ void testToStringAndWithCommentMarkerTakingCharacter() {
         Assertions.assertNotEquals(csvFormat, csvFormatTwo);
 
         Assertions.assertNotEquals(csvFormatTwo, csvFormat);
-        assertEquals("Delimiter=<,> QuoteChar=<\"> CommentStart=<n> " + "RecordSeparator=<\r\n> EmptyLines:ignored SkipHeaderRecord:false",
+        assertEquals("Delimiter=<,> QuoteChar=<\"> CommentStart=<n> RecordSeparator=<\r\n> EmptyLines:ignored SkipHeaderRecord:false",
                 csvFormatTwo.toString());
 
     }

src/test/java/org/apache/commons/csv/CSVParserTest.java

@@ -79,9 +79,13 @@ class CSVParserTest {
 
     private static final String UTF_8_NAME = UTF_8.name();
 
-    private static final String CSV_INPUT = "a,b,c,d\n" + " a , b , 1 2 \n" + "\"foo baar\", b,\n" +
+    // @formatter:off
+    private static final String CSV_INPUT = "a,b,c,d\n" +
+            " a , b , 1 2 \n" +
+            "\"foo baar\", b,\n" +
             // + " \"foo\n,,\n\"\",,\n\\\"\",d,e\n";
             "   \"foo\n,,\n\"\",,\n\"\"\",d,e\n"; // changed to use standard CSV escaping
+    // @formatter:on
 
     private static final String CSV_INPUT_1 = "a,b,c,d";
 
@@ -181,7 +185,7 @@ void testBackslashEscaping2() throws IOException {
         // We will test with a forward slash as the escape char, and a single
         // quote as the encapsulator.
         // @formatter:off
-        final String code = "" + " , , \n" + // 1)
+        final String code = " , , \n" + // 1)
             " \t ,  , \n" + // 2)
             " // , /, , /,\n" + // 3)
             "";
@@ -201,8 +205,17 @@ void testBackslashEscaping2() throws IOException {
     @Test
     @Disabled
     void testBackslashEscapingOld() throws IOException {
-        final String code = "one,two,three\n" + "on\\\"e,two\n" + "on\"e,two\n" + "one,\"tw\\\"o\"\n" + "one,\"t\\,wo\"\n" + "one,two,\"th,ree\"\n" +
-                "\"a\\\\\"\n" + "a\\,b\n" + "\"a\\\\,b\"";
+        // @formatter:off
+        final String code = "one,two,three\n" +
+                "on\\\"e,two\n" +
+                "on\"e,two\n" +
+                "one,\"tw\\\"o\"\n" +
+                "one,\"t\\,wo\"\n" +
+                "one,two,\"th,ree\"\n" +
+                "\"a\\\\\"\n" +
+                "a\\,b\n" +
+                "\"a\\\\,b\"";
+        // @formatter:on
         final String[][] res = { { "one", "two", "three" }, { "on\\\"e", "two" }, { "on\"e", "two" }, { "one", "tw\"o" }, { "one", "t\\,wo" }, // backslash in
                                                                                                                                                // quotes only
                                                                                                                                                // escapes a
@@ -417,7 +430,7 @@ void testCSV57() throws Exception {
     @Test
     void testDefaultFormat() throws IOException {
         // @formatter:off
-        final String code = "" + "a,b#\n" + // 1)
+        final String code = "a,b#\n" +      // 1)
             "\"\n\",\" \",#\n" +            // 2)
             "#,\"\"\n" +                    // 3)
             "# Final comment\n"             // 4)
@@ -548,7 +561,7 @@ void testEndOfFileBehaviorExcel() throws Exception {
 
     @Test
     void testExcelFormat1() throws IOException {
-        final String code = "value1,value2,value3,value4\r\na,b,c,d\r\n  x,,," + "\r\n\r\n\"\"\"hello\"\"\",\"  \"\"world\"\"\",\"abc\ndef\",\r\n";
+        final String code = "value1,value2,value3,value4\r\na,b,c,d\r\n  x,,,\r\n\r\n\"\"\"hello\"\"\",\"  \"\"world\"\"\",\"abc\ndef\",\r\n";
         final String[][] res = { { "value1", "value2", "value3", "value4" }, { "a", "b", "c", "d" }, { "  x", "", "", "" }, { "" },
                 { "\"hello\"", "  \"world\"", "abc\ndef", "" } };
         try (CSVParser parser = CSVParser.parse(code, CSVFormat.EXCEL)) {

src/test/java/org/apache/commons/csv/LexerTest.java

@@ -121,8 +121,14 @@ void testBackspace() throws Exception {
 
     @Test
     void testComments() throws IOException {
-        final String code = "first,line,\n" + "second,line,tokenWith#no-comment\n" + "# comment line \n" +
-                "third,line,#no-comment\n" + "# penultimate comment\n" + "# Final comment\n";
+        // @formatter:off
+        final String code = "first,line,\n" +
+                "second,line,tokenWith#no-comment\n" +
+                "# comment line \n" +
+                "third,line,#no-comment\n" +
+                "# penultimate comment\n" +
+                "# Final comment\n";
+        // @formatter:on
         final CSVFormat format = CSVFormat.DEFAULT.withCommentMarker('#');
         try (Lexer lexer = createLexer(code, format)) {
             assertNextToken(TOKEN, "first", lexer);
@@ -306,8 +312,21 @@ void testFF() throws Exception {
 
     @Test
     void testIgnoreEmptyLines() throws IOException {
-        final String code = "first,line,\n" + "\n" + "\n" + "second,line\n" + "\n" + "\n" + "third line \n" + "\n" +
-                "\n" + "last, line \n" + "\n" + "\n" + "\n";
+        // @formatter:off
+        final String code = "first,line,\n" +
+                "\n" +
+                "\n" +
+                "second,line\n" +
+                "\n" +
+                "\n" +
+                "third line \n" +
+                "\n" +
+                "\n" +
+                "last, line \n" +
+                "\n" +
+                "\n" +
+                "\n";
+        // @formatter:on
         final CSVFormat format = CSVFormat.DEFAULT.withIgnoreEmptyLines();
         try (Lexer lexer = createLexer(code, format)) {
             assertNextToken(TOKEN, "first", lexer);

src/test/java/org/apache/commons/csv/issues/JiraCsv148Test.java

@@ -55,7 +55,7 @@ void testWithTrimEmpty() {
             .get();
         // @formatter:on
         assertEquals(
-                "\"\",\"\",\"Single space on the left\",\"Single space on the right\"," + "\"Single spaces on both sides\",\"Multiple spaces on the left\"," +
+                "\"\",\"\",\"Single space on the left\",\"Single space on the right\",\"Single spaces on both sides\",\"Multiple spaces on the left\"," +
                         "\"Multiple spaces on the right\",\"Multiple spaces on both sides\"",
                 format.format("", " ", " Single space on the left", "Single space on the right ", " Single spaces on both sides ",
                         "   Multiple spaces on the left", "Multiple spaces on the right   ", "  Multiple spaces on both sides     "));

src/test/java/org/apache/commons/csv/issues/JiraCsv253Test.java

@@ -37,7 +37,13 @@ class JiraCsv253Test {
 
     @Test
     void testHandleAbsentValues() throws IOException {
-        final String source = "\"John\",,\"Doe\"\n" + ",\"AA\",123\n" + "\"John\",90,\n" + "\"\",,90";
+        // @formatter:off
+        final String source =
+                "\"John\",,\"Doe\"\n" +
+                ",\"AA\",123\n" +
+                "\"John\",90,\n" +
+                "\"\",,90";
+        // @formatter:on
         final CSVFormat csvFormat = CSVFormat.DEFAULT.builder().setQuoteMode(QuoteMode.NON_NUMERIC).get();
         try (CSVParser parser = csvFormat.parse(new StringReader(source))) {
             final Iterator<CSVRecord> csvRecords = parser.iterator();