Add MarkShieldInputStreamTest.testCloseHandleIOException()

Author: garydgregory

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

@@ -66,26 +66,19 @@ public void testAvailableAfterClose(final int len) throws Exception {
         assertEquals(0, shadow.available());
     }
 
-    @SuppressWarnings("resource")
     @ParameterizedTest
     @MethodSource(AbstractInputStreamTest.ARRAY_LENGTHS_NAME)
-    public void testReadAfterClose(final int len) throws Exception {
-        final InputStream shadow;
+    public void testAvailableAfterOpen(final int len) throws Exception {
         try (MarkTestableInputStream in = new MarkTestableInputStream(new NullInputStream(len, false, false));
                 final MarkShieldInputStream msis = new MarkShieldInputStream(in)) {
             assertEquals(len, in.available());
-            shadow = in;
         }
-        assertEquals(IOUtils.EOF, shadow.read());
     }
 
-    @ParameterizedTest
-    @MethodSource(AbstractInputStreamTest.ARRAY_LENGTHS_NAME)
-    public void testAvailableAfterOpen(final int len) throws Exception {
-        try (MarkTestableInputStream in = new MarkTestableInputStream(new NullInputStream(len, false, false));
-                final MarkShieldInputStream msis = new MarkShieldInputStream(in)) {
-            assertEquals(len, in.available());
-        }
+    @SuppressWarnings("resource")
+    @Test
+    public void testCloseHandleIOException() throws IOException {
+        ProxyInputStreamTest.testCloseHandleIOException(new MarkShieldInputStream(new BrokenInputStream((Throwable) new IOException())));
     }
 
     @Test
@@ -130,6 +123,19 @@ public void testMarkSupportedIsFalseWhenUnderlyingTrue() throws IOException {
         }
     }
 
+    @SuppressWarnings("resource")
+    @ParameterizedTest
+    @MethodSource(AbstractInputStreamTest.ARRAY_LENGTHS_NAME)
+    public void testReadAfterClose(final int len) throws Exception {
+        final InputStream shadow;
+        try (MarkTestableInputStream in = new MarkTestableInputStream(new NullInputStream(len, false, false));
+                final MarkShieldInputStream msis = new MarkShieldInputStream(in)) {
+            assertEquals(len, in.available());
+            shadow = in;
+        }
+        assertEquals(IOUtils.EOF, shadow.read());
+    }
+
     @Test
     public void testResetThrowsExceptionWhenUnderlyingDoesNotSupport() throws IOException {
         // test wrapping an underlying stream which does NOT support marking