Sort members

Author: garydgregory

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

@@ -105,16 +105,28 @@ public void testReadBufferOffsetLength() throws IOException {
         assertEquals(-1, stream.read(b, 0, b.length), "read(b, off, len)");
     }
 
-    @Test
-    public void testResetBeforeEndCtor() throws IOException {
-        try (final AutoCloseInputStream inputStream = new AutoCloseInputStream(new ByteArrayInputStream("1234".getBytes()))) {
-            testResetBeforeEnd(inputStream);
-        }
+    private void testResetBeforeEnd(final AutoCloseInputStream inputStream) throws IOException {
+        inputStream.mark(1);
+        assertEquals('1', inputStream.read());
+        inputStream.reset();
+        assertEquals('1', inputStream.read());
+        assertEquals('2', inputStream.read());
+        inputStream.reset();
+        assertEquals('1', inputStream.read());
+        assertEquals('2', inputStream.read());
+        assertEquals('3', inputStream.read());
+        inputStream.reset();
+        assertEquals('1', inputStream.read());
+        assertEquals('2', inputStream.read());
+        assertEquals('3', inputStream.read());
+        assertEquals('4', inputStream.read());
+        inputStream.reset();
+        assertEquals('1', inputStream.read());
     }
 
     @Test
-    public void testResetBeforeEndSetInputStream() throws IOException {
-        try (final AutoCloseInputStream inputStream = AutoCloseInputStream.builder().setInputStream(new ByteArrayInputStream("1234".getBytes())).get()) {
+    public void testResetBeforeEndCtor() throws IOException {
+        try (final AutoCloseInputStream inputStream = new AutoCloseInputStream(new ByteArrayInputStream("1234".getBytes()))) {
             testResetBeforeEnd(inputStream);
         }
     }
@@ -133,23 +145,11 @@ public void testResetBeforeEndSetCharSequence() throws IOException {
         }
     }
 
-    private void testResetBeforeEnd(final AutoCloseInputStream inputStream) throws IOException {
-        inputStream.mark(1);
-        assertEquals('1', inputStream.read());
-        inputStream.reset();
-        assertEquals('1', inputStream.read());
-        assertEquals('2', inputStream.read());
-        inputStream.reset();
-        assertEquals('1', inputStream.read());
-        assertEquals('2', inputStream.read());
-        assertEquals('3', inputStream.read());
-        inputStream.reset();
-        assertEquals('1', inputStream.read());
-        assertEquals('2', inputStream.read());
-        assertEquals('3', inputStream.read());
-        assertEquals('4', inputStream.read());
-        inputStream.reset();
-        assertEquals('1', inputStream.read());
+    @Test
+    public void testResetBeforeEndSetInputStream() throws IOException {
+        try (final AutoCloseInputStream inputStream = AutoCloseInputStream.builder().setInputStream(new ByteArrayInputStream("1234".getBytes())).get()) {
+            testResetBeforeEnd(inputStream);
+        }
     }
 
 }

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

@@ -205,6 +205,11 @@ protected void testConstructorFileInput() throws IOException {
         }
     }
 
+    @Test
+    protected void testConstructorFileInputNull() {
+        assertThrows(NullPointerException.class, () -> new XmlStreamReader((File) null));
+    }
+
     @Test
     protected void testConstructorFileInputOpenOptions() throws IOException {
         try (XmlStreamReader reader = new XmlStreamReader(new File("pom.xml"))) {
@@ -215,11 +220,6 @@ protected void testConstructorFileInputOpenOptions() throws IOException {
         }
     }
 
-    @Test
-    protected void testConstructorFileInputNull() {
-        assertThrows(NullPointerException.class, () -> new XmlStreamReader((File) null));
-    }
-
     @Test
     protected void testConstructorInputStreamInput() throws IOException {
         final Path path = Paths.get("pom.xml");