Fix interface discovery in CloseShieldChannel #800

Sort members

Author: garydgregory

src/changes/changes.xml

@@ -56,6 +56,7 @@ The <action> type attribute can be add,update,fix,remove.
       <action type="fix" dev="pkarwasz"                due-to="Piotr P. Karwasz">IOUtils.toByteArray(InputStream) now throws IOException on byte array overflow.</action>
       <action type="fix" dev="ggregory"                due-to="Gary Gregory, Piotr P. Karwasz">Javadoc general improvements.</action>
       <action type="fix" dev="ggregory"                due-to="Piotr P. Karwasz">IOUtils.toByteArray() now throws EOFException when not enough data is available #796.</action>
+      <action type="fix" dev="pkarwasz"                due-to="Piotr P. Karwasz">Fix interface discovery in `CloseShieldChannel` #800.</action> 
       <!-- ADD -->
       <action dev="ggregory" type="add"                due-to="strangelookingnerd, Gary Gregory">FileUtils#byteCountToDisplaySize() supports Zettabyte, Yottabyte, Ronnabyte and Quettabyte #763.</action>
       <action dev="ggregory" type="add"                due-to="strangelookingnerd, Gary Gregory">Add org.apache.commons.io.FileUtils.ONE_RB #763.</action>

src/test/java/org/apache/commons/io/channels/CloseShieldChannelTest.java

@@ -119,6 +119,24 @@ void testCloseIsShielded(final Class<? extends Channel> channelClass) throws Exc
         verify(channel, times(2)).isOpen();
     }
 
+    @Test
+    void testCorrectlyDetectsInterfaces(@TempDir Path tempDir) throws IOException {
+        final Path testFile = tempDir.resolve("test.txt");
+        FileUtils.touch(testFile.toFile());
+        try (FileChannel channel = FileChannel.open(testFile); Channel shield = CloseShieldChannel.wrap(channel)) {
+            assertInstanceOf(SeekableByteChannel.class, shield);
+            assertInstanceOf(GatheringByteChannel.class, shield);
+            assertInstanceOf(WritableByteChannel.class, shield);
+            assertInstanceOf(ScatteringByteChannel.class, shield);
+            assertInstanceOf(ReadableByteChannel.class, shield);
+            assertInstanceOf(InterruptibleChannel.class, shield);
+            assertInstanceOf(ByteChannel.class, shield);
+            assertInstanceOf(Channel.class, shield);
+            // These are not interfaces, so can not be implemented
+            assertFalse(shield instanceof FileChannel, "not FileChannel");
+        }
+    }
+
     @Test
     void testDoesNotDoubleWrap() {
         final ByteChannel channel = mock(ByteChannel.class);
@@ -286,22 +304,4 @@ void testWritableByteChannelMethods() throws Exception {
         assertThrows(ClosedChannelException.class, () -> shield.write(null));
         verifyNoMoreInteractions(channel);
     }
-
-    @Test
-    void testCorrectlyDetectsInterfaces(@TempDir Path tempDir) throws IOException {
-        final Path testFile = tempDir.resolve("test.txt");
-        FileUtils.touch(testFile.toFile());
-        try (FileChannel channel = FileChannel.open(testFile); Channel shield = CloseShieldChannel.wrap(channel)) {
-            assertInstanceOf(SeekableByteChannel.class, shield);
-            assertInstanceOf(GatheringByteChannel.class, shield);
-            assertInstanceOf(WritableByteChannel.class, shield);
-            assertInstanceOf(ScatteringByteChannel.class, shield);
-            assertInstanceOf(ReadableByteChannel.class, shield);
-            assertInstanceOf(InterruptibleChannel.class, shield);
-            assertInstanceOf(ByteChannel.class, shield);
-            assertInstanceOf(Channel.class, shield);
-            // These are not interfaces, so can not be implemented
-            assertFalse(shield instanceof FileChannel, "not FileChannel");
-        }
-    }
 }