Browse Source

PullCommandTest: Use try-with-resources for File{Input,Output}Stream

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

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

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

Loading…
Cancel
Save