From adb0cca09abccb56a409c7d488c45014f68d0eb6 Mon Sep 17 00:00:00 2001
From: Jano Svitok <jan.svitok@gmail.com>
Date: Mon, 6 Aug 2018 13:22:55 +0200
Subject: [PATCH] Convert to try-with-resources

---
 .../jadb/test/integration/RealDeviceTestCases.java       | 6 +-----
 .../vidstige/jadb/test/unit/AdbOutputStreamFixture.java  | 9 +++------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/test/se/vidstige/jadb/test/integration/RealDeviceTestCases.java b/test/se/vidstige/jadb/test/integration/RealDeviceTestCases.java
index 22df5d7..9913e9d 100644
--- a/test/se/vidstige/jadb/test/integration/RealDeviceTestCases.java
+++ b/test/se/vidstige/jadb/test/integration/RealDeviceTestCases.java
@@ -111,13 +111,9 @@ public class RealDeviceTestCases {
     @Test
     public void testScreenshot() throws Exception {
         JadbDevice any = jadb.getAnyDevice();
-        FileOutputStream outputStream = null;
-        try {
-            outputStream = new FileOutputStream(temporaryFolder.newFile("screenshot.png"));
+        try (FileOutputStream outputStream = new FileOutputStream(temporaryFolder.newFile("screenshot.png"))) {
             InputStream stdout = any.executeShell("screencap", "-p");
             Stream.copy(stdout, outputStream);
-        }  finally {
-            if (outputStream != null) outputStream.close();
         }
     }
 
diff --git a/test/se/vidstige/jadb/test/unit/AdbOutputStreamFixture.java b/test/se/vidstige/jadb/test/unit/AdbOutputStreamFixture.java
index 09a012d..0ecb7f7 100644
--- a/test/se/vidstige/jadb/test/unit/AdbOutputStreamFixture.java
+++ b/test/se/vidstige/jadb/test/unit/AdbOutputStreamFixture.java
@@ -12,12 +12,9 @@ public class AdbOutputStreamFixture {
 
     private byte[] passthrough(byte[] input) throws IOException {
         ByteArrayOutputStream output = new ByteArrayOutputStream();
-        OutputStream sut = new AdbFilterOutputStream(output);
-        try {
-	        sut.write(input);
-	        sut.flush();
-        } finally {
-        	sut.close();
+        try (OutputStream sut = new AdbFilterOutputStream(output)) {
+            sut.write(input);
+            sut.flush();
         }
         return output.toByteArray();
     }