Add CountingInputStream tests

Author: garydgregory

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

@@ -46,6 +46,10 @@ public abstract class AbstractInputStreamTest {
 
     protected InputStream[] inputStreams;
 
+    static final String ARRAY_LENGTHS_NAME = "org.apache.commons.io.input.AbstractInputStreamTest#getArrayLengths";
+
+    static final int[] ARRAY_LENGTHS = { 0, 1, 2, 4, 8, 16, 32, 64, 128 };
+
     @BeforeEach
     public void setUp() throws IOException {
         // Create a byte array of size 2 MB with random bytes
@@ -177,4 +181,8 @@ public void testSkipFromFileChannel() throws IOException {
             }
         }
     }
+
+    static int[] getArrayLengths() {
+        return ARRAY_LENGTHS;
+    }
 }

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

@@ -26,7 +26,7 @@
 import org.apache.commons.io.IOUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.ValueSource;
+import org.junit.jupiter.params.provider.MethodSource;
 
 /**
  * Tests {@link CountingInputStream}.
@@ -35,10 +35,10 @@ public class CountingInputStreamTest {
 
     @SuppressWarnings("resource")
     @ParameterizedTest
-    @ValueSource(ints = { 0, 1, 2, 4, 8, 16, 32, 64, 128 })
+    @MethodSource(AbstractInputStreamTest.ARRAY_LENGTHS_NAME)
     public void testAvailableAfterClose(final int len) throws Exception {
         final ByteArrayInputStream bais = new ByteArrayInputStream(new byte[len]);
-        InputStream shadow;
+        final InputStream shadow;
         try (InputStream in = CloseShieldInputStream.wrap(bais)) {
             assertEquals(len, in.available());
             shadow = in;
@@ -47,7 +47,7 @@ public void testAvailableAfterClose(final int len) throws Exception {
     }
 
     @ParameterizedTest
-    @ValueSource(ints = { 0, 1, 2, 4, 8, 16, 32, 64, 128 })
+    @MethodSource(AbstractInputStreamTest.ARRAY_LENGTHS_NAME)
     public void testAvailableAfterOpen(final int len) throws Exception {
         final ByteArrayInputStream bais = new ByteArrayInputStream(new byte[len]);
         try (InputStream in = CloseShieldInputStream.wrap(bais)) {
@@ -144,7 +144,7 @@ public void testLargeFiles_IO84() throws Exception {
         assertThrows(ArithmeticException.class, () -> cis.getCount());
         assertThrows(ArithmeticException.class, () -> cis.resetCount());
 
-        mock.close();
+        mock.init();
 
         // Test long methods
         IOUtils.consume(cis);
@@ -154,10 +154,10 @@ public void testLargeFiles_IO84() throws Exception {
 
     @SuppressWarnings("resource")
     @ParameterizedTest
-    @ValueSource(ints = { 0, 1, 2, 4, 8, 16, 32, 64, 128 })
+    @MethodSource(AbstractInputStreamTest.ARRAY_LENGTHS_NAME)
     public void testReadAfterClose(final int len) throws Exception {
         final ByteArrayInputStream bais = new ByteArrayInputStream(new byte[len]);
-        InputStream shadow;
+        final InputStream shadow;
         try (InputStream in = CloseShieldInputStream.wrap(bais)) {
             assertEquals(len, in.available());
             shadow = in;