Extract the chunked test reader into a shared ChunkedReader based on StringReader

Author: saleemno1

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

@@ -1711,36 +1711,8 @@ void testParseWithDelimiterStringWithEscape() throws IOException {
 
     @Test
     void testParseWithDelimiterStringFromChunkedReader() throws IOException {
-        // A reader that hands out one character at a time and never reports itself ready, like a socket or pipe.
-        final Reader chunked = new Reader() {
-
-            private final String content = "a[|]b\r\nc![!|!]d[|]e";
-            private int index;
-
-            @Override
-            public void close() {
-                // nothing to close
-            }
-
-            @Override
-            public boolean ready() {
-                return false;
-            }
-
-            @Override
-            public int read(final char[] buf, final int offset, final int length) {
-                if (index >= content.length()) {
-                    return -1;
-                }
-                if (length <= 0) {
-                    return 0;
-                }
-                buf[offset] = content.charAt(index++);
-                return 1;
-            }
-        };
         final CSVFormat csvFormat = CSVFormat.DEFAULT.builder().setDelimiter("[|]").setEscape('!').get();
-        try (CSVParser csvParser = csvFormat.parse(chunked)) {
+        try (CSVParser csvParser = csvFormat.parse(new ChunkedReader("a[|]b\r\nc![!|!]d[|]e"))) {
             CSVRecord csvRecord = csvParser.nextRecord();
             assertEquals("a", csvRecord.get(0));
             assertEquals("b", csvRecord.get(1));

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

@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.commons.csv;
+
+import java.io.IOException;
+import java.io.StringReader;
+
+/**
+ * A {@link StringReader} that hands out one character per call and never reports itself ready, like a socket or a pipe that delivers data in chunks.
+ */
+final class ChunkedReader extends StringReader {
+
+    ChunkedReader(final String content) {
+        super(content);
+    }
+
+    @Override
+    public int read(final char[] buf, final int offset, final int length) throws IOException {
+        return length <= 0 ? 0 : super.read(buf, offset, 1);
+    }
+
+    @Override
+    public boolean ready() {
+        return false;
+    }
+}

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

@@ -273,39 +273,4 @@ void testPeekArrayPastEndOfChunkedReader() throws Exception {
             assertEquals('b', peeked[1]);
         }
     }
-
-    /**
-     * A reader that returns one character per call and never reports itself ready, like a socket or pipe that delivers data in chunks.
-     */
-    private static final class ChunkedReader extends java.io.Reader {
-
-        private final String content;
-        private int index;
-
-        ChunkedReader(final String content) {
-            this.content = content;
-        }
-
-        @Override
-        public void close() {
-            // nothing to close
-        }
-
-        @Override
-        public boolean ready() {
-            return false;
-        }
-
-        @Override
-        public int read(final char[] buf, final int offset, final int length) {
-            if (index >= content.length()) {
-                return EOF;
-            }
-            if (length <= 0) {
-                return 0;
-            }
-            buf[offset] = content.charAt(index++);
-            return 1;
-        }
-    }
 }