Add BOMInputStreamTest.testCloseHandleIOException()

Author: garydgregory

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

@@ -20,8 +20,6 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -88,17 +86,9 @@ public void testClose() throws IOException {
         assertTrue(stream.isClosed(), "closed");
     }
 
-    @SuppressWarnings("resource")
     @Test
     public void testCloseHandleIOException() throws IOException {
-        final IOException exception = new IOException();
-        @SuppressWarnings({ "deprecation" })
-        final ProxyInputStream inputStream = AutoCloseInputStream.builder().setInputStream(new BrokenInputStream(exception)).get();
-        assertFalse(inputStream.isClosed(), "closed");
-        final ProxyInputStream spy = spy(inputStream);
-        assertThrows(IOException.class, spy::close);
-        verify(spy).handleIOException(exception);
-        assertFalse(spy.isClosed(), "closed");
+        ProxyInputStreamTest.testCloseHandleIOException(AutoCloseInputStream.builder());
     }
 
     @Test

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

@@ -262,6 +262,11 @@ public void testClose() throws Exception {
         }
     }
 
+    @Test
+    public void testCloseHandleIOException() throws IOException {
+        ProxyInputStreamTest.testCloseHandleIOException(BOMInputStream.builder());
+    }
+
     @Test
     public void testEmptyBufferWithBOM() throws Exception {
         final byte[] data = {};

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

@@ -19,7 +19,11 @@
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertSame;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -28,6 +32,7 @@
 import java.util.Arrays;
 
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.io.build.AbstractStreamBuilder;
 import org.junit.jupiter.api.Test;
 
 /**
@@ -48,6 +53,18 @@ void setIn(final InputStream proxy) {
         }
     }
 
+    @SuppressWarnings("resource")
+    static <T, B extends AbstractStreamBuilder<T, B>> void testCloseHandleIOException(final AbstractStreamBuilder<T, B> builder) throws IOException {
+        final IOException exception = new IOException();
+        @SuppressWarnings({ "deprecation" })
+        final ProxyInputStream inputStream = (ProxyInputStream) builder.setInputStream(new BrokenInputStream(exception)).get();
+        assertFalse(inputStream.isClosed(), "closed");
+        final ProxyInputStream spy = spy(inputStream);
+        assertThrows(IOException.class, spy::close);
+        verify(spy).handleIOException(exception);
+        assertFalse(spy.isClosed(), "closed");
+    }
+
     @SuppressWarnings({ "resource", "unused" }) // For subclasses
     protected T createFixture() throws IOException {
         return (T) new ProxyInputStreamFixture(createProxySource());