Use try-with-resources
Convert try finally block to try-with-resources
Change-Id: I7d58492f356d04ba88d209f8b4c735e54f4a1975
Signed-off-by: Carsten Hammer <carsten.hammer@t-online.de>
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/TestBug380859.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/TestBug380859.java
index 094a4f4..85f7104 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/TestBug380859.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/TestBug380859.java
@@ -35,18 +35,18 @@
try {
// create plugin_customization.ini file
File file = new File(FILE_NAME);
- BufferedWriter writer = new BufferedWriter(new FileWriter(file));
- writer.write(RuntimeTestsPlugin.PI_RUNTIME_TESTS + "/a=v1\n");
- writer.write(RuntimeTestsPlugin.PI_RUNTIME_TESTS + "//b=v2\n");
- writer.write(RuntimeTestsPlugin.PI_RUNTIME_TESTS + "///c=v3\n");
- writer.write(RuntimeTestsPlugin.PI_RUNTIME_TESTS + "////d=v4\n");
- writer.write(RuntimeTestsPlugin.PI_RUNTIME_TESTS + "/a/b=v5\n");
- writer.write(RuntimeTestsPlugin.PI_RUNTIME_TESTS + "/c//d=v6\n");
- writer.write(RuntimeTestsPlugin.PI_RUNTIME_TESTS + "//e//f=v7\n");
- writer.write(RuntimeTestsPlugin.PI_RUNTIME_TESTS + "/a/b/c=v8\n");
- writer.write(RuntimeTestsPlugin.PI_RUNTIME_TESTS + "/a/b//c/d=v9\n");
- writer.write(RuntimeTestsPlugin.PI_RUNTIME_TESTS + "/a/b//c//d=v10\n");
- writer.close();
+ try (BufferedWriter writer = new BufferedWriter(new FileWriter(file))) {
+ writer.write(RuntimeTestsPlugin.PI_RUNTIME_TESTS + "/a=v1\n");
+ writer.write(RuntimeTestsPlugin.PI_RUNTIME_TESTS + "//b=v2\n");
+ writer.write(RuntimeTestsPlugin.PI_RUNTIME_TESTS + "///c=v3\n");
+ writer.write(RuntimeTestsPlugin.PI_RUNTIME_TESTS + "////d=v4\n");
+ writer.write(RuntimeTestsPlugin.PI_RUNTIME_TESTS + "/a/b=v5\n");
+ writer.write(RuntimeTestsPlugin.PI_RUNTIME_TESTS + "/c//d=v6\n");
+ writer.write(RuntimeTestsPlugin.PI_RUNTIME_TESTS + "//e//f=v7\n");
+ writer.write(RuntimeTestsPlugin.PI_RUNTIME_TESTS + "/a/b/c=v8\n");
+ writer.write(RuntimeTestsPlugin.PI_RUNTIME_TESTS + "/a/b//c/d=v9\n");
+ writer.write(RuntimeTestsPlugin.PI_RUNTIME_TESTS + "/a/b//c//d=v10\n");
+ }
// add pluginCustomization argument
Setup setup = suite.getSetup();
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/TestBug388004.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/TestBug388004.java
index 777ae98..556cc83 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/TestBug388004.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/internal/preferences/TestBug388004.java
@@ -39,9 +39,9 @@
try {
// create plugin_customization.ini file
File file = new File(FILE_NAME);
- BufferedWriter writer = new BufferedWriter(new FileWriter(file));
- writer.write("org.eclipse.core.tests.runtime/dummy_node/key=value");
- writer.close();
+ try (BufferedWriter writer = new BufferedWriter(new FileWriter(file))) {
+ writer.write("org.eclipse.core.tests.runtime/dummy_node/key=value");
+ }
// add pluginCustomization argument
Setup setup = suite.getSetup();
diff --git a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_412138.java b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_412138.java
index 5132638..3dc19b3 100644
--- a/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_412138.java
+++ b/tests/org.eclipse.core.tests.runtime/src/org/eclipse/core/tests/runtime/jobs/Bug_412138.java
@@ -88,9 +88,9 @@
// from reporting test results; serialize the error to a helper file and
// exit JVM to "resolve" deadlock
try {
- ObjectOutputStream stream = new ObjectOutputStream(new FileOutputStream(FILE_NAME));
- stream.writeObject(e);
- stream.close();
+ try (ObjectOutputStream stream = new ObjectOutputStream(new FileOutputStream(FILE_NAME))) {
+ stream.writeObject(e);
+ }
} catch (IOException e1) {
// we can't do anything if saving the error failed
// print the original error, so that there is at least some trace
@@ -108,9 +108,10 @@
// if the file does not exist, there was no deadlock so the whole test pass
if (file.exists()) {
try {
- ObjectInputStream stream = new ObjectInputStream(new FileInputStream(FILE_NAME));
- AssertionFailedError e = (AssertionFailedError) stream.readObject();
- stream.close();
+ AssertionFailedError e;
+ try (ObjectInputStream stream = new ObjectInputStream(new FileInputStream(FILE_NAME))) {
+ e = (AssertionFailedError) stream.readObject();
+ }
throw e;
} catch (IOException | ClassNotFoundException e) {
// re-throw since file existence already says the test failed
