Update tests to user StringInputStream's builder.

Author: garydgregory

src/test/java/org/apache/commons/io/CopyUtilsTest.java

@@ -101,7 +101,7 @@ public void copy_inputStreamToWriterWithEncoding() throws Exception {
         final String inDataStr = "data";
         final String charsetName = StandardCharsets.UTF_8.name();
         final StringWriter writer = new StringWriter();
-        CopyUtils.copy(new StringInputStream(inDataStr, charsetName), writer, charsetName);
+        CopyUtils.copy(new StringInputStream.Builder().setString(inDataStr).setCharset(charsetName).get(), writer, charsetName);
         assertEquals(inDataStr, writer.toString());
     }
 

src/test/java/org/apache/commons/io/DemuxInputStreamTest.java

@@ -140,7 +140,7 @@ private String getOutput(final String threadName) {
     }
 
     private void startReader(final String name, final String data, final DemuxInputStream demux) {
-        final InputStream input = new StringInputStream(data);
+        final InputStream input = new StringInputStream.Builder().setString(data).get();
         final ReaderThread thread = new ReaderThread(name, input, demux);
         threadMap.put(name, thread);
     }

src/test/java/org/apache/commons/io/IOUtilsTest.java

@@ -966,7 +966,7 @@ public void testReadFully_InputStream_ByteArray() throws Exception {
 
     @Test
     public void testReadFully_InputStream_Offset() throws Exception {
-        final StringInputStream stream = new StringInputStream("abcd1234", StandardCharsets.UTF_8);
+        final StringInputStream stream = new StringInputStream.Builder().setString("abcd1234").setCharset(StandardCharsets.UTF_8).get();
         final byte[] buffer = "wx00000000".getBytes(StandardCharsets.UTF_8);
         IOUtils.readFully(stream, buffer, 2, 8);
         assertEquals("wxabcd1234", new String(buffer, 0, buffer.length, StandardCharsets.UTF_8));

src/test/java/org/apache/commons/io/input/BOMInputStreamTest.java

@@ -152,14 +152,15 @@ private InputStream createUtf8Input(final byte[] baseData, final boolean addBOM)
         return new ByteArrayInputStream(data);
     }
 
-    private boolean doesSaxSupportCharacterSet(final String charSetName) throws ParserConfigurationException, SAXException, IOException {
+    private boolean doesSaxSupportCharacterSet(final String charsetName) throws ParserConfigurationException, SAXException, IOException {
         final DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-        try (StringInputStream byteStream = new StringInputStream("<?xml version=\"1.0\" encoding=\"" + charSetName + "\"?><Z/>", charSetName)) {
+        try (StringInputStream byteStream = new StringInputStream.Builder().setString("<?xml version=\"1.0\" encoding=\"" + charsetName + "\"?><Z/>")
+                .setCharset(charsetName).get()) {
             final InputSource is = new InputSource(byteStream);
-            is.setEncoding(charSetName);
+            is.setEncoding(charsetName);
             documentBuilder.parse(is);
         } catch (final SAXParseException e) {
-            if (e.getMessage().contains(charSetName)) {
+            if (e.getMessage().contains(charsetName)) {
                 return false;
             }
         }

src/test/java/org/apache/commons/io/input/CountingInputStreamTest.java

@@ -33,7 +33,7 @@ public class CountingInputStreamTest {
     @Test
     public void testCounting() throws Exception {
         final String text = "A piece of text";
-        try (CountingInputStream cis = new CountingInputStream(new StringInputStream(text))) {
+        try (CountingInputStream cis = new CountingInputStream(new StringInputStream.Builder().setString(text).get())) {
 
             // have to declare this larger as we're going to read
             // off the end of the stream and input stream seems
@@ -149,7 +149,7 @@ public void testResetting() throws Exception {
     @Test
     public void testSkipping() throws IOException {
         final String text = "Hello World!";
-        try (CountingInputStream cis = new CountingInputStream(new StringInputStream(text))) {
+        try (CountingInputStream cis = new CountingInputStream(new StringInputStream.Builder().setString(text).get())) {
 
             assertEquals(6, cis.skip(6));
             assertEquals(6, cis.getCount());

src/test/java/org/apache/commons/io/input/StringInputStream.java

@@ -21,56 +21,56 @@
 import java.io.StringReader;
 import java.nio.charset.Charset;
 
+import org.apache.commons.io.build.AbstractStreamBuilder;
+
 /**
  * An {@link InputStream} on a String.
  *
- * @since 2.12.0
+ * @since 2.13.0
  */
 public class StringInputStream extends ReaderInputStream {
 
     /**
-     * Creates a new instance on a String.
-     *
-     * @param source The source string, MUST not be null.
-     * @return A new instance.
+     * Builds a new {@link ReaderInputStream} instance.
+     * <p>
+     * For example:
+     * </p>
+     * <pre>{@code
+     * ReaderInputStream s = ReaderInputStream.builder()
+     *   .setString("String")
+     *   .setCharsetEncoder(Charset.defaultCharset())
+     *   .get()}
+     * </pre>
+     * <p>
      */
-    public static StringInputStream on(final String source) {
-        return new StringInputStream(source);
-    }
+    public static class Builder extends AbstractStreamBuilder<StringInputStream, Builder> {
 
-    /**
-     * Creates a new instance on the empty String.
-     */
-    public StringInputStream() {
-        this("", Charset.defaultCharset());
-    }
+        private String string;
 
-    /**
-     * Creates a new instance on a String.
-     *
-     * @param source The source string, MUST not be null.
-     */
-    public StringInputStream(final String source) {
-        this(source, Charset.defaultCharset());
-    }
+        /**
+         * Constructs a new instance.
+         *
+         * Only uses the String and Charset aspects of this builder.
+         * @throws UnsupportedOperationException if the origin cannot be converted to a Reader.
+         */
+        @Override
+        public StringInputStream get() {
+            return new StringInputStream(string, getCharset());
+        }
 
-    /**
-     * Creates a new instance on a String for a Charset.
-     *
-     * @param source The source string, MUST not be null.
-     * @param charset The source charset, MUST not be null.
-     */
-    public StringInputStream(final String source, final Charset charset) {
-        super(new StringReader(source), charset);
-    }
+        public Builder setString(final String string) {
+            this.string = string;
+            return this;
+        }
 
+    }
     /**
-     * Creates a new instance on a String and for a Charset.
+     * Creates a new instance on a String for a Charset.
      *
      * @param source The source string, MUST not be null.
      * @param charset The source charset, MUST not be null.
      */
-    public StringInputStream(final String source, final String charset) {
+    private StringInputStream(final String source, final Charset charset) {
         super(new StringReader(source), charset);
     }
 

src/test/java/org/apache/commons/io/input/StringInputStreamTest.java

@@ -23,6 +23,7 @@
 import java.nio.charset.Charset;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.input.StringInputStream.Builder;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -32,14 +33,14 @@ public class StringInputStreamTest {
 
     @Test
     public void testStringConstructorString() throws IOException {
-        try (StringInputStream input = StringInputStream.on("01")) {
+        try (StringInputStream input = new Builder().setString("01").get()) {
             assertEquals("01", IOUtils.toString(input, Charset.defaultCharset()));
         }
     }
 
     @Test
     public void testStringConstructorStringCharset() throws IOException {
-        try (StringInputStream input = new StringInputStream("01", Charset.defaultCharset())) {
+        try (StringInputStream input = new Builder().setString("01").setCharset(Charset.defaultCharset()).get()) {
             assertEquals("01", IOUtils.toString(input, Charset.defaultCharset()));
         }
     }

src/test/java/org/apache/commons/io/input/UncheckedFilterInputStreamTest.java

@@ -41,7 +41,8 @@ public class UncheckedFilterInputStreamTest {
     @SuppressWarnings("resource")
     @BeforeEach
     public void beforeEach() {
-        stringInputStream = UncheckedFilterInputStream.builder().setInputStream(new BufferedInputStream(new StringInputStream("01"))).get();
+        stringInputStream = UncheckedFilterInputStream.builder().setInputStream(new BufferedInputStream(new StringInputStream.Builder().setString("01").get()))
+                .get();
         exception = new IOException("test exception");
         brokenInputStream = UncheckedFilterInputStream.builder().setInputStream(new BrokenInputStream(exception)).get();
     }

src/test/java/org/apache/commons/io/input/WindowsLineEndingInputStreamTest.java

@@ -56,7 +56,8 @@ private String roundtrip(final String msg) throws IOException {
     }
 
     private String roundtrip(final String msg, final boolean ensure) throws IOException {
-        try (WindowsLineEndingInputStream lf = new WindowsLineEndingInputStream(new StringInputStream(msg, StandardCharsets.UTF_8), ensure)) {
+        try (WindowsLineEndingInputStream lf = new WindowsLineEndingInputStream(
+                new StringInputStream.Builder().setString(msg).setCharset(StandardCharsets.UTF_8).get(), ensure)) {
             final byte[] buf = new byte[100];
             final int read = lf.read(buf);
             return new String(buf, 0, read, StandardCharsets.UTF_8);

src/test/java/org/apache/commons/io/input/XmlStreamReaderTest.java

@@ -379,7 +379,7 @@ public void testHttp() throws Exception {
     public void testHttpContent() throws Exception {
         final String encoding = UTF_8;
         final String xml = getXML("no-bom", XML3, encoding, encoding);
-        try (XmlStreamReader xmlReader = new XmlStreamReader(new StringInputStream(xml, encoding))) {
+        try (XmlStreamReader xmlReader = new XmlStreamReader(new StringInputStream.Builder().setString(xml).setCharset(encoding).get())) {
             assertEquals(xmlReader.getEncoding(), encoding, "Check encoding");
             assertEquals(xml, IOUtils.toString(xmlReader), "Check content");
         }
@@ -505,7 +505,7 @@ protected void testRawBomValid(final String encoding) throws Exception {
     public void testRawContent() throws Exception {
         final String encoding = UTF_8;
         final String xml = getXML("no-bom", XML3, encoding, encoding);
-        try (XmlStreamReader xmlReader = new XmlStreamReader(new StringInputStream(xml, encoding))) {
+        try (XmlStreamReader xmlReader = new XmlStreamReader(new StringInputStream.Builder().setString(xml).setCharset(encoding).get())) {
             assertEquals(xmlReader.getEncoding(), encoding, "Check encoding");
             assertEquals(xml, IOUtils.toString(xmlReader), "Check content");
         }