Sort members

Author: garydgregory

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

@@ -1668,20 +1668,6 @@ void testParsingPrintedEmptyFirstColumn(final CSVFormat.Predefined format) throw
         }
     }
 
-    /**
-     * Tests <a href="https://issues.apache.org/jira/browse/CSV-324">CSV-324</a>.
-     */
-    @Test
-    void testPartialMultiCharacterDelimiterAtEOF() throws IOException {
-        final CSVFormat format = CSVFormat.DEFAULT.builder().setDelimiter("[|]").get();
-        try (CSVParser parser = format.parse(new StringReader("a[|]b[|"))) {
-            final CSVRecord record = parser.nextRecord();
-            assertEquals("a", record.get(0));
-            assertEquals("b[|", record.get(1));
-            assertEquals(2, record.size());
-        }
-    }
-
     /**
      * A truncated escaped multi-character delimiter at EOF must stay literal data and not be completed from a stale
      * escape delimiter look-ahead.
@@ -1696,6 +1682,20 @@ void testPartialEscapedMultiCharacterDelimiterAtEOF() throws IOException {
         }
     }
 
+    /**
+     * Tests <a href="https://issues.apache.org/jira/browse/CSV-324">CSV-324</a>.
+     */
+    @Test
+    void testPartialMultiCharacterDelimiterAtEOF() throws IOException {
+        final CSVFormat format = CSVFormat.DEFAULT.builder().setDelimiter("[|]").get();
+        try (CSVParser parser = format.parse(new StringReader("a[|]b[|"))) {
+            final CSVRecord record = parser.nextRecord();
+            assertEquals("a", record.get(0));
+            assertEquals("b[|", record.get(1));
+            assertEquals(2, record.size());
+        }
+    }
+
     @Test
     void testProvidedHeader() throws Exception {
         final Reader in = new StringReader("a,b,c\n1,2,3\nx,y,z");

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

@@ -423,26 +423,6 @@ void testDelimeterStringQuoteNone() throws IOException {
         }
     }
 
-    @Test
-    void testQuoteCharEscapedWithQuoteModeNone() throws IOException {
-        final CSVFormat format = CSVFormat.DEFAULT.builder().setQuote('"').setEscape('?').setQuoteMode(QuoteMode.NONE).get();
-        final StringWriter sw = new StringWriter();
-        try (CSVPrinter printer = new CSVPrinter(sw, format)) {
-            printer.printRecord("\"abc", "x\"y");
-            printer.printRecord(new StringReader("\"abc"), new StringReader("x\"y"));
-        }
-        assertEquals("?\"abc,x?\"y" + RECORD_SEPARATOR + "?\"abc,x?\"y" + RECORD_SEPARATOR, sw.toString());
-        // The emitted records must read back as the original values.
-        try (CSVParser parser = CSVParser.parse(sw.toString(), format)) {
-            final List<CSVRecord> records = parser.getRecords();
-            assertEquals(2, records.size());
-            for (final CSVRecord record : records) {
-                assertEquals("\"abc", record.get(0));
-                assertEquals("x\"y", record.get(1));
-            }
-        }
-    }
-
     @Test
     void testDelimiterEscaped() throws IOException {
         final StringWriter sw = new StringWriter();
@@ -1818,6 +1798,26 @@ void testQuoteAll() throws IOException {
         }
     }
 
+    @Test
+    void testQuoteCharEscapedWithQuoteModeNone() throws IOException {
+        final CSVFormat format = CSVFormat.DEFAULT.builder().setQuote('"').setEscape('?').setQuoteMode(QuoteMode.NONE).get();
+        final StringWriter sw = new StringWriter();
+        try (CSVPrinter printer = new CSVPrinter(sw, format)) {
+            printer.printRecord("\"abc", "x\"y");
+            printer.printRecord(new StringReader("\"abc"), new StringReader("x\"y"));
+        }
+        assertEquals("?\"abc,x?\"y" + RECORD_SEPARATOR + "?\"abc,x?\"y" + RECORD_SEPARATOR, sw.toString());
+        // The emitted records must read back as the original values.
+        try (CSVParser parser = CSVParser.parse(sw.toString(), format)) {
+            final List<CSVRecord> records = parser.getRecords();
+            assertEquals(2, records.size());
+            for (final CSVRecord record : records) {
+                assertEquals("\"abc", record.get(0));
+                assertEquals("x\"y", record.get(1));
+            }
+        }
+    }
+
     @Test
     void testQuoteCommaFirstChar() throws IOException {
         final StringWriter sw = new StringWriter();

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

@@ -409,18 +409,6 @@ void testNextToken6() throws IOException {
         }
     }
 
-    /**
-     * Tests <a href="https://issues.apache.org/jira/browse/CSV-324">CSV-324</a>.
-     */
-    @Test
-    void testPartialMultiCharacterDelimiterAtEOF() throws IOException {
-        final CSVFormat format = CSVFormat.DEFAULT.builder().setDelimiter("[|]").get();
-        try (Lexer lexer = createLexer("a[|]b[|", format)) {
-            assertNextToken(TOKEN, "a", lexer);
-            assertNextToken(EOF, "b[|", lexer);
-        }
-    }
-
     /**
      * A truncated escaped multi-character delimiter at EOF must not be accepted by reusing the previous escape delimiter
      * look-ahead in {@link Lexer#isEscapeDelimiter()}.
@@ -433,6 +421,18 @@ void testPartialEscapedMultiCharacterDelimiterAtEOF() throws IOException {
         }
     }
 
+    /**
+     * Tests <a href="https://issues.apache.org/jira/browse/CSV-324">CSV-324</a>.
+     */
+    @Test
+    void testPartialMultiCharacterDelimiterAtEOF() throws IOException {
+        final CSVFormat format = CSVFormat.DEFAULT.builder().setDelimiter("[|]").get();
+        try (Lexer lexer = createLexer("a[|]b[|", format)) {
+            assertNextToken(TOKEN, "a", lexer);
+            assertNextToken(EOF, "b[|", lexer);
+        }
+    }
+
     @Test
     void testReadEscapeBackspace() throws IOException {
         try (Lexer lexer = createLexer("b", CSVFormat.DEFAULT.withEscape('\b'))) {