Use try-with-resources and format to 120 line length.

Author: garydgregory

src/test/java/org/apache/commons/io/function/IOFunctionTest.java

@@ -154,8 +154,9 @@ public void testAndThenConsumer() throws IOException {
     @Test
     public void testIdentity() throws IOException {
         final IOFunction<InputStream, InputStream> identityFunction = IOFunction.identity();
-        final InputStream is = new ByteArrayInputStream(new byte[] { (byte)0xa, (byte)0xb, (byte)0xc});
-        assertEquals(is, identityFunction.apply(is));
+        try (final InputStream is = new ByteArrayInputStream(new byte[] { (byte) 0xa, (byte) 0xb, (byte) 0xc })) {
+            assertEquals(is, identityFunction.apply(is));
+        }
     }
 
     private static class Holder<T> {

src/test/java/org/apache/commons/io/output/ByteArrayOutputStreamTestCase.java

@@ -59,11 +59,10 @@ private int writeData(final AbstractByteArrayOutputStream baout,
             baout.write(100);
             ref.write(100);
             return 1;
-        } else {
-            baout.write(DATA, 0, count);
-            ref.write(DATA, 0, count);
-            return count;
         }
+        baout.write(DATA, 0, count);
+        ref.write(DATA, 0, count);
+        return count;
     }
 
     private int writeData(final AbstractByteArrayOutputStream baout,
@@ -180,31 +179,31 @@ public void testToInputStreamEmpty(final String baosName, final BAOSFactory baos
     @ParameterizedTest(name = "[{index}] {0}")
     @MethodSource("toBufferedInputStreamFunctionFactories")
     public void testToBufferedInputStreamEmpty(final String baosName, final IOFunction<InputStream, InputStream> toBufferedInputStreamFunction) throws IOException {
-        final ByteArrayInputStream bain = new ByteArrayInputStream(new byte[0]);
-        assertEquals(0, bain.available());
+        try (final ByteArrayInputStream bain = new ByteArrayInputStream(new byte[0])) {
+            assertEquals(0, bain.available());
 
-        final InputStream buffered = toBufferedInputStreamFunction.apply(bain);
-        assertEquals(0, buffered.available());
+            try (final InputStream buffered = toBufferedInputStreamFunction.apply(bain)) {
+                assertEquals(0, buffered.available());
 
-        buffered.close();
-        bain.close();
+            }
+        }
     }
 
     @ParameterizedTest(name = "[{index}] {0}")
     @MethodSource("toBufferedInputStreamFunctionFactories")
     public void testToBufferedInputStream(final String baosName, final IOFunction<InputStream, InputStream> toBufferedInputStreamFunction) throws IOException {
         final byte data[] = {(byte)0xCA, (byte)0xFE, (byte)0xBA, (byte)0xBE};
 
-        final ByteArrayInputStream bain = new ByteArrayInputStream(data);
-        assertEquals(data.length, bain.available());
+        try (final ByteArrayInputStream bain = new ByteArrayInputStream(data)) {
+            assertEquals(data.length, bain.available());
 
-        final InputStream buffered = toBufferedInputStreamFunction.apply(bain);
-        assertEquals(data.length, buffered.available());
+            try (final InputStream buffered = toBufferedInputStreamFunction.apply(bain)) {
+                assertEquals(data.length, buffered.available());
 
-        assertArrayEquals(data, IOUtils.toByteArray(buffered));
+                assertArrayEquals(data, IOUtils.toByteArray(buffered));
 
-        buffered.close();
-        bain.close();
+            }
+        }
     }
 
     @ParameterizedTest(name = "[{index}] {0}")

src/test/java/org/apache/commons/io/output/ChunkedOutputStreamTest.java

@@ -32,30 +32,29 @@ public class ChunkedOutputStreamTest {
     @Test
     public void write_four_chunks() throws Exception {
         final AtomicInteger numWrites = new AtomicInteger();
-        final ByteArrayOutputStream baos = getByteArrayOutputStream(numWrites);
-        final ChunkedOutputStream chunked = new ChunkedOutputStream(baos, 10);
-        chunked.write("0123456789012345678901234567891".getBytes());
-        assertEquals(4, numWrites.get());
-        chunked.close();
+        try (final ByteArrayOutputStream baos = newByteArrayOutputStream(numWrites);
+            final ChunkedOutputStream chunked = new ChunkedOutputStream(baos, 10)) {
+            chunked.write("0123456789012345678901234567891".getBytes());
+            assertEquals(4, numWrites.get());
+        }
     }
 
     @Test
     public void negative_chunksize_not_permitted() {
-        assertThrows(IllegalArgumentException.class,
-               () -> new ChunkedOutputStream(new ByteArrayOutputStream(), 0));
+        assertThrows(IllegalArgumentException.class, () -> new ChunkedOutputStream(new ByteArrayOutputStream(), 0));
     }
 
     @Test
     public void defaultConstructor() throws IOException {
         final AtomicInteger numWrites = new AtomicInteger();
-        final ByteArrayOutputStream baos = getByteArrayOutputStream(numWrites);
-        final ChunkedOutputStream chunked = new ChunkedOutputStream(baos);
-        chunked.write(new byte[1024 * 4 + 1]);
-        assertEquals(2, numWrites.get());
-        chunked.close();
+        try (final ByteArrayOutputStream baos = newByteArrayOutputStream(numWrites);
+            final ChunkedOutputStream chunked = new ChunkedOutputStream(baos)) {
+            chunked.write(new byte[1024 * 4 + 1]);
+            assertEquals(2, numWrites.get());
+        }
     }
 
-    private ByteArrayOutputStream getByteArrayOutputStream(final AtomicInteger numWrites) {
+    private ByteArrayOutputStream newByteArrayOutputStream(final AtomicInteger numWrites) {
         return new ByteArrayOutputStream() {
             @Override
             public void write(final byte[] b, final int off, final int len) {
@@ -65,5 +64,4 @@ public void write(final byte[] b, final int off, final int len) {
         };
     }
 
-
 }