Bug 518587 - Modernize o.e.equinox.p2.testsI20170623-0110I20170622-2000

Use try-with-resources.

Change-Id: I6c1d3efb7f0fd4f5dd0f014d8801ec8e375355f9
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

2 files changed, 6 insertions, 17 deletions

diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/BackupTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/BackupTest.java
index 00256f36d..0a8f7bcad 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/BackupTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/BackupTest.java
@@ -73,11 +73,9 @@ public class BackupTest extends AbstractProvisioningTest {
 	private void writeToFile(File file, String content) throws IOException {
 		file.getParentFile().mkdirs();
 		file.createNewFile();
-		Writer writer = new BufferedWriter(new FileWriter(file));
-		try {
+
+		try (Writer writer = new BufferedWriter(new FileWriter(file))) {
 			writer.write(content);
-		} finally {
-			writer.close();
 		}
 	}
 
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/FileUtilsTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/FileUtilsTest.java
index 0a1b2862c..9c209c7f7 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/FileUtilsTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/core/FileUtilsTest.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
- * Copyright (c) 2008,2009 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
+ * Copyright (c) 2008,2017 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *     EclipseSource - Bug fix
@@ -211,9 +211,7 @@ public class FileUtilsTest extends AbstractProvisioningTest {
 	private static void assertExists(String message, File archive, String entry) {
 		if (!archive.exists())
 			fail(message + " file does not exist.");
-		ZipFile zip = null;
-		try {
-			zip = new ZipFile(archive);
+		try (ZipFile zip = new ZipFile(archive)) {
 			boolean found = false;
 			for (Enumeration e = zip.entries(); !found && e.hasMoreElements();) {
 				ZipEntry zipEntry = (ZipEntry) e.nextElement();
@@ -223,13 +221,6 @@ public class FileUtilsTest extends AbstractProvisioningTest {
 			assertTrue(message, found);
 		} catch (IOException e) {
 			fail(message, e);
-		} finally {
-			if (zip != null)
-				try {
-					zip.close();
-				} catch (IOException e) {
-					// ignore
-				}
 		}
 	}