Sort members

Author: garydgregory

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

@@ -207,14 +207,6 @@ private void readFile(final BOMInputStream bomInputStream) throws Exception {
         } while (bytes > 0);
     }
 
-    @Test
-    public void testAvailableWithBOMAfterOpen() throws Exception {
-        final byte[] data = { 'A', 'B', 'C', 'D' };
-        try (InputStream in = BOMInputStream.builder().setInputStream(createUtf8Input(data, true)).get()) {
-            assertEquals(7, in.available());
-        }
-    }
-
     @Test
     public void testAvailableWithBOMAfterClose() throws Exception {
         final byte[] data = { 'A', 'B', 'C', 'D' };
@@ -227,14 +219,11 @@ public void testAvailableWithBOMAfterClose() throws Exception {
     }
 
     @Test
-    public void testReadAfterClose() throws Exception {
+    public void testAvailableWithBOMAfterOpen() throws Exception {
         final byte[] data = { 'A', 'B', 'C', 'D' };
-        final InputStream shadow;
         try (InputStream in = BOMInputStream.builder().setInputStream(createUtf8Input(data, true)).get()) {
             assertEquals(7, in.available());
-            shadow = in;
         }
-        assertEquals(IOUtils.EOF, shadow.read());
     }
 
     @Test
@@ -437,6 +426,17 @@ public void testNoBoms() throws Exception {
                 .close());
     }
 
+    @Test
+    public void testReadAfterClose() throws Exception {
+        final byte[] data = { 'A', 'B', 'C', 'D' };
+        final InputStream shadow;
+        try (InputStream in = BOMInputStream.builder().setInputStream(createUtf8Input(data, true)).get()) {
+            assertEquals(7, in.available());
+            shadow = in;
+        }
+        assertEquals(IOUtils.EOF, shadow.read());
+    }
+
     @Test
     public void testReadEmpty() throws Exception {
         final byte[] data = {};

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

@@ -90,14 +90,6 @@ public void testAvailableAfterClose() throws IOException {
         }
     }
 
-    @Test
-    public void testReasdAfterClose() throws IOException {
-        try (InputStream inputStream = createInputStream()) {
-            inputStream.close();
-            assertEquals(IOUtils.EOF, inputStream.read());
-        }
-    }
-
     @Test
     public void testAvailableAfterOpen() throws IOException {
         try (InputStream inputStream = createInputStream()) {
@@ -309,6 +301,14 @@ public void testReadZeroEmptyString() throws Exception {
         }
     }
 
+    @Test
+    public void testReasdAfterClose() throws IOException {
+        try (InputStream inputStream = createInputStream()) {
+            inputStream.close();
+            assertEquals(IOUtils.EOF, inputStream.read());
+        }
+    }
+
     @Test
     public void testResetCharset() {
         assertNotNull(ReaderInputStream.builder().setReader(new StringReader("\uD800")).setCharset((Charset) null).getCharset());