Browse Source

PullCommandWithRebaseTest: Open File{Input|Output}Stream in try-with-resource

Change-Id: I1ff707ab7bab676603907f4c0bb1bc495503055b
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
stable-4.11
David Pursehouse 7 years ago
parent
commit
8212924ede
  1. 15
      org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandWithRebaseTest.java

15
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/PullCommandWithRebaseTest.java

@ -395,24 +395,16 @@ public class PullCommandWithRebaseTest extends RepositoryTestCase {
private static void writeToFile(File actFile, String string) private static void writeToFile(File actFile, String string)
throws IOException { throws IOException {
FileOutputStream fos = null; try (FileOutputStream fos = new FileOutputStream(actFile)) {
try {
fos = new FileOutputStream(actFile);
fos.write(string.getBytes(UTF_8)); fos.write(string.getBytes(UTF_8));
fos.close();
} finally {
if (fos != null)
fos.close();
} }
} }
private static void assertFileContentsEqual(File actFile, String string) private static void assertFileContentsEqual(File actFile, String string)
throws IOException { throws IOException {
ByteArrayOutputStream bos = new ByteArrayOutputStream(); ByteArrayOutputStream bos = new ByteArrayOutputStream();
FileInputStream fis = null;
byte[] buffer = new byte[100]; byte[] buffer = new byte[100];
try { try (FileInputStream fis = new FileInputStream(actFile)) {
fis = new FileInputStream(actFile);
int read = fis.read(buffer); int read = fis.read(buffer);
while (read > 0) { while (read > 0) {
bos.write(buffer, 0, read); bos.write(buffer, 0, read);
@ -420,9 +412,6 @@ public class PullCommandWithRebaseTest extends RepositoryTestCase {
} }
String content = new String(bos.toByteArray(), "UTF-8"); String content = new String(bos.toByteArray(), "UTF-8");
assertEquals(string, content); assertEquals(string, content);
} finally {
if (fis != null)
fis.close();
} }
} }
} }

Loading…
Cancel
Save