From 48554989d30a427e69f6a78a8a0ded5c885dc64d Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Tue, 13 Mar 2018 20:20:09 +0900 Subject: [PATCH] AutoLFInputStreamTest: Use try-with-resource Change-Id: I162bfa6b2f87f2ce9154f3ed6bb628c4cda88f50 Signed-off-by: David Pursehouse --- .../jgit/util/io/AutoLFInputStreamTest.java | 53 ++++++++++--------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/AutoLFInputStreamTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/AutoLFInputStreamTest.java index 8b955bae68..5058165802 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/AutoLFInputStreamTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/util/io/AutoLFInputStreamTest.java @@ -97,35 +97,38 @@ public class AutoLFInputStreamTest { private static void test(byte[] input, byte[] expected, boolean detectBinary) throws IOException { - final InputStream bis1 = new ByteArrayInputStream(input); - final InputStream cis1 = new AutoLFInputStream(bis1, detectBinary); - int index1 = 0; - for (int b = cis1.read(); b != -1; b = cis1.read()) { - assertEquals(expected[index1], (byte) b); - index1++; - } - - assertEquals(expected.length, index1); - - for (int bufferSize = 1; bufferSize < 10; bufferSize++) { - final byte[] buffer = new byte[bufferSize]; - final InputStream bis2 = new ByteArrayInputStream(input); - final InputStream cis2 = new AutoLFInputStream(bis2, detectBinary); + try (InputStream bis1 = new ByteArrayInputStream(input); + InputStream cis1 = new AutoLFInputStream(bis1, detectBinary)) { + int index1 = 0; + for (int b = cis1.read(); b != -1; b = cis1.read()) { + assertEquals(expected[index1], (byte) b); + index1++; + } - int read = 0; - for (int readNow = cis2.read(buffer, 0, buffer.length); readNow != -1 - && read < expected.length; readNow = cis2.read(buffer, 0, - buffer.length)) { - for (int index2 = 0; index2 < readNow; index2++) { - assertEquals(expected[read + index2], buffer[index2]); + assertEquals(expected.length, index1); + + for (int bufferSize = 1; bufferSize < 10; bufferSize++) { + final byte[] buffer = new byte[bufferSize]; + try (InputStream bis2 = new ByteArrayInputStream(input); + InputStream cis2 = new AutoLFInputStream(bis2, + detectBinary)) { + + int read = 0; + for (int readNow = cis2.read(buffer, 0, + buffer.length); readNow != -1 + && read < expected.length; readNow = cis2 + .read(buffer, 0, buffer.length)) { + for (int index2 = 0; index2 < readNow; index2++) { + assertEquals(expected[read + index2], + buffer[index2]); + } + read += readNow; + } + + assertEquals(expected.length, read); } - read += readNow; } - - assertEquals(expected.length, read); - cis2.close(); } - cis1.close(); } private static byte[] asBytes(String in) { -- 2.39.5