Fill the lookahead buffer on short reads from a chunked source (#625).

Sort members

Author: garydgregory

src/changes/changes.xml

@@ -69,6 +69,7 @@
       <action type="fix" dev="ggregory" due-to="Naveed Khan, Gary Gregory">Skip trailing delimiter on comment lines in printComment (#623).</action>
       <action type="fix" dev="ggregory" due-to="Gary Gregory, Naveed Khan">Fix SpotBugs 4.10.3 USO_UNSAFE_METHOD_SYNCHRONIZATION in CSVFormat print methods (#624).</action>
       <action type="fix" dev="ggregory" due-to="Gary Gregory, Naveed Khan">Count rows produced instead of getRow() in printRecords(ResultSet) (#627).</action>
+      <action type="fix" dev="ggregory" due-to="Gary Gregory, saleem malik">Fill the lookahead buffer on short reads from a chunked source (#625).</action>
       <!-- ADD -->
       <action type="add" dev="ggregory" due-to="Gary Gregory, Indy, Sylvia van Os" issue="CSV-307">Add an "Android Compatibility" section to the web site.</action>
       <action type="add" dev="ggregory" due-to="Ruiqi Dong, Gary Gregory" issue="CSV-325">Add CSVParser.Builder.setByteOffset(long) (#604).</action>

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

@@ -1696,29 +1696,29 @@ void testParseUrlCharsetNullFormat() throws IOException {
     }
 
     @Test
-    void testParseWithDelimiterStringWithEscape() throws IOException {
-        final String source = "a![!|!]b![|]c[|]xyz\r\nabc[abc][|]xyz";
+    void testParseWithDelimiterStringFromChunkedReader() throws IOException {
         final CSVFormat csvFormat = CSVFormat.DEFAULT.builder().setDelimiter("[|]").setEscape('!').get();
-        try (CSVParser csvParser = csvFormat.parse(new StringReader(source))) {
+        try (CSVParser csvParser = csvFormat.parse(new ChunkedReader("a[|]b\r\nc![!|!]d[|]e"))) {
             CSVRecord csvRecord = csvParser.nextRecord();
-            assertEquals("a[|]b![|]c", csvRecord.get(0));
-            assertEquals("xyz", csvRecord.get(1));
+            assertEquals("a", csvRecord.get(0));
+            assertEquals("b", csvRecord.get(1));
             csvRecord = csvParser.nextRecord();
-            assertEquals("abc[abc]", csvRecord.get(0));
-            assertEquals("xyz", csvRecord.get(1));
+            assertEquals("c[|]d", csvRecord.get(0));
+            assertEquals("e", csvRecord.get(1));
         }
     }
 
     @Test
-    void testParseWithDelimiterStringFromChunkedReader() throws IOException {
+    void testParseWithDelimiterStringWithEscape() throws IOException {
+        final String source = "a![!|!]b![|]c[|]xyz\r\nabc[abc][|]xyz";
         final CSVFormat csvFormat = CSVFormat.DEFAULT.builder().setDelimiter("[|]").setEscape('!').get();
-        try (CSVParser csvParser = csvFormat.parse(new ChunkedReader("a[|]b\r\nc![!|!]d[|]e"))) {
+        try (CSVParser csvParser = csvFormat.parse(new StringReader(source))) {
             CSVRecord csvRecord = csvParser.nextRecord();
-            assertEquals("a", csvRecord.get(0));
-            assertEquals("b", csvRecord.get(1));
+            assertEquals("a[|]b![|]c", csvRecord.get(0));
+            assertEquals("xyz", csvRecord.get(1));
             csvRecord = csvParser.nextRecord();
-            assertEquals("c[|]d", csvRecord.get(0));
-            assertEquals("e", csvRecord.get(1));
+            assertEquals("abc[abc]", csvRecord.get(0));
+            assertEquals("xyz", csvRecord.get(1));
         }
     }
 

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

@@ -55,6 +55,39 @@ void testEmptyInput() throws Exception {
         }
     }
 
+    @Test
+    void testPeekArrayPastEndOfChunkedReader() throws Exception {
+        try (ExtendedBufferedReader br = new ExtendedBufferedReader(new ChunkedReader("ab"))) {
+            final char[] peeked = new char[4];
+            assertEquals(2, br.peek(peeked));
+            assertEquals('a', peeked[0]);
+            assertEquals('b', peeked[1]);
+        }
+    }
+
+    @Test
+    void testReadAndPeekArrayFromChunkedReader() throws Exception {
+        try (ExtendedBufferedReader br = new ExtendedBufferedReader(new ChunkedReader("abcdef"))) {
+            final char[] peeked = new char[3];
+            assertEquals(3, br.peek(peeked));
+            assertArrayEquals(new char[] { 'a', 'b', 'c' }, peeked);
+            final char[] read = new char[3];
+            assertEquals(3, br.read(read, 0, 3));
+            assertArrayEquals(new char[] { 'a', 'b', 'c' }, read);
+        }
+    }
+
+    @Test
+    void testReadArrayPastEndOfChunkedReader() throws Exception {
+        try (ExtendedBufferedReader br = new ExtendedBufferedReader(new ChunkedReader("ab"))) {
+            final char[] read = new char[4];
+            assertEquals(2, br.read(read, 0, 4));
+            assertEquals('a', read[0]);
+            assertEquals('b', read[1]);
+            assertEquals(EOF, br.read(read, 0, 4));
+        }
+    }
+
     /*
      * Test to illustrate https://issues.apache.org/jira/browse/CSV-75
      */
@@ -240,37 +273,4 @@ void testReadLookahead2() throws Exception {
             assertEquals('d', br.getLastChar());
         }
     }
-
-    @Test
-    void testReadAndPeekArrayFromChunkedReader() throws Exception {
-        try (ExtendedBufferedReader br = new ExtendedBufferedReader(new ChunkedReader("abcdef"))) {
-            final char[] peeked = new char[3];
-            assertEquals(3, br.peek(peeked));
-            assertArrayEquals(new char[] { 'a', 'b', 'c' }, peeked);
-            final char[] read = new char[3];
-            assertEquals(3, br.read(read, 0, 3));
-            assertArrayEquals(new char[] { 'a', 'b', 'c' }, read);
-        }
-    }
-
-    @Test
-    void testReadArrayPastEndOfChunkedReader() throws Exception {
-        try (ExtendedBufferedReader br = new ExtendedBufferedReader(new ChunkedReader("ab"))) {
-            final char[] read = new char[4];
-            assertEquals(2, br.read(read, 0, 4));
-            assertEquals('a', read[0]);
-            assertEquals('b', read[1]);
-            assertEquals(EOF, br.read(read, 0, 4));
-        }
-    }
-
-    @Test
-    void testPeekArrayPastEndOfChunkedReader() throws Exception {
-        try (ExtendedBufferedReader br = new ExtendedBufferedReader(new ChunkedReader("ab"))) {
-            final char[] peeked = new char[4];
-            assertEquals(2, br.peek(peeked));
-            assertEquals('a', peeked[0]);
-            assertEquals('b', peeked[1]);
-        }
-    }
 }