Refactor tests to isolate deprecated constructor use

Author: garydgregory

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

@@ -46,27 +46,34 @@ private RandomAccessFile createRandomAccessFile() throws FileNotFoundException {
         return RandomAccessFileMode.READ_ONLY.create(DATA_FILE_NAME);
     }
 
+    @SuppressWarnings("resource")
     @Test
     public void testAvailableAfterClose() throws IOException {
-        try (RandomAccessFileInputStream inputStream = new RandomAccessFileInputStream(createRandomAccessFile(),
-            true)) {
+        try (RandomAccessFileInputStream inputStream = RandomAccessFileInputStream.builder()
+                .setRandomAccessFile(createRandomAccessFile())
+                .setCloseOnClose(true)
+                .get()) {
             inputStream.close();
             assertEquals(0, inputStream.available());
         }
     }
 
     @Test
     public void testAvailableAfterOpen() throws IOException {
-        try (RandomAccessFileInputStream inputStream = new RandomAccessFileInputStream(createRandomAccessFile(),
-            true)) {
+        try (RandomAccessFileInputStream inputStream = RandomAccessFileInputStream.builder()
+                .setRandomAccessFile(createRandomAccessFile())
+                .setCloseOnClose(true)
+                .get()) {
             assertEquals(DATA_FILE_LEN, inputStream.available());
         }
     }
 
     @Test
     public void testAvailableLong() throws IOException {
-        try (RandomAccessFileInputStream inputStream = new RandomAccessFileInputStream(createRandomAccessFile(),
-            true)) {
+        try (RandomAccessFileInputStream inputStream = RandomAccessFileInputStream.builder()
+                .setRandomAccessFile(createRandomAccessFile())
+                .setCloseOnClose(true)
+                .get()) {
             assertEquals(DATA_FILE_LEN, inputStream.availableLong());
         }
     }
@@ -130,7 +137,9 @@ public void testBuilderRandomAccessFile() throws IOException {
     @Test
     public void testConstructorCloseOnCloseFalse() throws IOException {
         try (RandomAccessFile file = createRandomAccessFile()) {
-            try (RandomAccessFileInputStream inputStream = new RandomAccessFileInputStream(file, false)) {
+            try (RandomAccessFileInputStream inputStream = RandomAccessFileInputStream.builder()
+                    .setRandomAccessFile(createRandomAccessFile())
+                    .get()) {
                 assertFalse(inputStream.isCloseOnClose());
                 assertNotEquals(-1, inputStream.getRandomAccessFile().read());
             }
@@ -140,7 +149,7 @@ public void testConstructorCloseOnCloseFalse() throws IOException {
 
     @SuppressWarnings("resource") // instance variable access
     @Test
-    public void testConstructorCloseOnCloseTrue() throws IOException {
+    public void testDeprecatedConstructorCloseOnCloseTrue() throws IOException {
         try (RandomAccessFile file = createRandomAccessFile()) {
             try (RandomAccessFileInputStream inputStream = new RandomAccessFileInputStream(file, true)) {
                 assertTrue(inputStream.isCloseOnClose());
@@ -152,7 +161,7 @@ public void testConstructorCloseOnCloseTrue() throws IOException {
 
     @SuppressWarnings("resource") // instance variable access
     @Test
-    public void testConstructorRandomAccessFile() throws IOException {
+    public void testDeprecatedConstructorRandomAccessFile() throws IOException {
         try (RandomAccessFile file = createRandomAccessFile()) {
             try (RandomAccessFileInputStream inputStream = new RandomAccessFileInputStream(file)) {
                 assertFalse(inputStream.isCloseOnClose());
@@ -162,15 +171,40 @@ public void testConstructorRandomAccessFile() throws IOException {
         }
     }
 
+    @SuppressWarnings("deprecation")
+    @Test
+    public void testDeprecatedConstructors() throws IOException {
+        try (RandomAccessFile randomAccessFile = createRandomAccessFile()) {
+            try (RandomAccessFileInputStream inputStream = new RandomAccessFileInputStream(randomAccessFile)) {
+                assertFalse(inputStream.isCloseOnClose());
+                assertEquals(randomAccessFile, inputStream.getRandomAccessFile());
+            }
+            try (RandomAccessFileInputStream inputStream = new RandomAccessFileInputStream(randomAccessFile, true)) {
+                assertTrue(inputStream.isCloseOnClose());
+                assertEquals(randomAccessFile, inputStream.getRandomAccessFile());
+            }
+            try (RandomAccessFileInputStream inputStream = new RandomAccessFileInputStream(randomAccessFile, false)) {
+                assertFalse(inputStream.isCloseOnClose());
+                assertEquals(randomAccessFile, inputStream.getRandomAccessFile());
+            }
+        }
+    }
+
+    @SuppressWarnings("deprecation")
     @Test
-    public void testConstructorRandomAccessFileNull() {
+    public void testDeprecatedConstructorsNull() {
         assertThrows(NullPointerException.class, () -> new RandomAccessFileInputStream(null));
+        assertThrows(NullPointerException.class, () -> new RandomAccessFileInputStream(null, true));
+        assertThrows(NullPointerException.class, () -> new RandomAccessFileInputStream(null, false));
     }
 
     @Test
     public void testGetters() throws IOException {
         try (RandomAccessFile file = createRandomAccessFile()) {
-            try (RandomAccessFileInputStream inputStream = new RandomAccessFileInputStream(file, true)) {
+            try (RandomAccessFileInputStream inputStream = RandomAccessFileInputStream.builder()
+                    .setRandomAccessFile(file)
+                    .setCloseOnClose(true)
+                    .get()) {
                 assertEquals(file, inputStream.getRandomAccessFile());
                 assertTrue(inputStream.isCloseOnClose());
             }
@@ -179,8 +213,10 @@ public void testGetters() throws IOException {
 
     @Test
     public void testRead() throws IOException {
-        try (RandomAccessFileInputStream inputStream = new RandomAccessFileInputStream(createRandomAccessFile(),
-            true)) {
+        try (RandomAccessFileInputStream inputStream = RandomAccessFileInputStream.builder()
+                .setRandomAccessFile(createRandomAccessFile())
+                .setCloseOnClose(true)
+                .get()) {
             // A Test Line.
             assertEquals('A', inputStream.read());
             assertEquals(' ', inputStream.read());
@@ -201,17 +237,21 @@ public void testRead() throws IOException {
 
     @Test
     public void testReadAfterClose() throws IOException {
-        try (RandomAccessFileInputStream inputStream = new RandomAccessFileInputStream(createRandomAccessFile(),
-            true)) {
+        try (RandomAccessFileInputStream inputStream = RandomAccessFileInputStream.builder()
+                .setRandomAccessFile(createRandomAccessFile())
+                .setCloseOnClose(true)
+                .get()) {
             inputStream.close();
             assertThrows(IOException.class, inputStream::read);
         }
     }
 
     @Test
     public void testReadByteArray() throws IOException {
-        try (RandomAccessFileInputStream inputStream = new RandomAccessFileInputStream(createRandomAccessFile(),
-            true)) {
+        try (RandomAccessFileInputStream inputStream = RandomAccessFileInputStream.builder()
+                .setRandomAccessFile(createRandomAccessFile())
+                .setCloseOnClose(true)
+                .get()) {
             // A Test Line.
             final int dataLen = 12;
             final byte[] buffer = new byte[dataLen];
@@ -225,8 +265,10 @@ public void testReadByteArray() throws IOException {
 
     @Test
     public void testReadByteArrayBounds() throws IOException {
-        try (RandomAccessFileInputStream inputStream = new RandomAccessFileInputStream(createRandomAccessFile(),
-            true)) {
+        try (RandomAccessFileInputStream inputStream = RandomAccessFileInputStream.builder()
+                .setRandomAccessFile(createRandomAccessFile())
+                .setCloseOnClose(true)
+                .get()) {
             // A Test Line.
             final int dataLen = 12;
             final byte[] buffer = new byte[dataLen];
@@ -242,7 +284,9 @@ public void testReadByteArrayBounds() throws IOException {
     public void testSkip() throws IOException {
 
         try (RandomAccessFile file = createRandomAccessFile();
-            final RandomAccessFileInputStream inputStream = new RandomAccessFileInputStream(file, false)) {
+            final RandomAccessFileInputStream inputStream = RandomAccessFileInputStream.builder()
+                    .setRandomAccessFile(file)
+                    .get()) {
             assertEquals(0, inputStream.skip(-1));
             assertEquals(0, inputStream.skip(Integer.MIN_VALUE));
             assertEquals(0, inputStream.skip(0));