Clear escape delimiter buffer before peek in Lexer.isEscapeDelimiter()

(apache#608, apache#611).

Refactor magic strings in tests

Author: garydgregory

src/changes/changes.xml

@@ -54,7 +54,7 @@
       <action type="fix" dev="ggregory" due-to="Ruiqi Dong, Gary Gregory" issue="CSV-326">CSVPrinter Reader printing with quote and escape can emit CSV that its parser cannot read back.</action>
       <action type="fix" dev="ggregory" due-to="Ruiqi Dong, Gary Gregory" issue="CSV-327">CSVParser applies maxRows to record numbers instead of rows produced when setRecordNumber(...) is used.</action>
       <action type="fix" dev="ggregory" due-to="OldTruckDriver, Gary Gregory" issue="CSV-326">Escape Reader values with quote and escape (#606).</action>
-      <action type="fix" dev="ggregory" due-to="Dexter.k, Gary Gregory">Clear escape delimiter buffer before peek in isEscapeDelimiter (#608).</action>
+      <action type="fix" dev="ggregory" due-to="Dexter.k, Gary Gregory">Clear escape delimiter buffer before peek in Lexer.isEscapeDelimiter() (#608, #611).</action>
       <action type="fix" dev="ggregory" due-to="Dexter.k, Gary Gregory">Escape quote char in printWithEscapes when QuoteMode is NONE (#609).</action>
       <action type="fix" dev="ggregory" due-to="Dexter.k, Gary Gregory">Quote value starting with comment marker in minimal quote mode (#610)..</action>
       <!-- ADD -->

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

@@ -1704,9 +1704,10 @@ void testPartialMultiCharacterDelimiterAtEOF() throws IOException {
     void testPartialMultiCharacterDelimiterAtEOFAfterMismatch() throws IOException {
         final CSVFormat format = CSVFormat.DEFAULT.builder().setDelimiter("[|]").get();
         // The "[a]" peek leaves ']' in the look-ahead buffer; the trailing "[|" must not match "[|]".
-        try (CSVParser parser = format.parse(new StringReader("x[a][|"))) {
+        final String recordString = "x[a][|";
+        try (CSVParser parser = format.parse(new StringReader(recordString))) {
             final CSVRecord record = parser.nextRecord();
-            assertEquals("x[a][|", record.get(0));
+            assertEquals(recordString, record.get(0));
             assertEquals(1, record.size());
         }
     }

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

@@ -441,8 +441,9 @@ void testPartialMultiCharacterDelimiterAtEOF() throws IOException {
     void testPartialMultiCharacterDelimiterAtEOFAfterMismatch() throws IOException {
         final CSVFormat format = CSVFormat.DEFAULT.builder().setDelimiter("[|]").get();
         // The "[a]" peek leaves ']' in the look-ahead buffer; the trailing "[|" must not match "[|]".
-        try (Lexer lexer = createLexer("x[a][|", format)) {
-            assertNextToken(EOF, "x[a][|", lexer);
+        final String recordString = "x[a][|";
+        try (Lexer lexer = createLexer(recordString, format)) {
+            assertNextToken(EOF, recordString, lexer);
         }
     }