Repository: ant Updated Branches: refs/heads/master 6bde21eb0 -> 44cb39844
Tidy up the code (use try with resources) Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/44cb3984 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/44cb3984 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/44cb3984 Branch: refs/heads/master Commit: 44cb398444c4dab32fa2b0ebb27303f9db605222 Parents: 43e6fdc Author: Gintas Grigelionis <gin...@apache.org> Authored: Tue Apr 24 07:08:11 2018 +0200 Committer: Gintas Grigelionis <gin...@apache.org> Committed: Tue Apr 24 07:08:44 2018 +0200 ---------------------------------------------------------------------- .../org/apache/tools/ant/taskdefs/FilterTest.java | 1 - .../ant/taskdefs/ProtectedJarMethodsTest.java | 3 +-- .../ant/taskdefs/optional/ReplaceRegExpTest.java | 18 ++++-------------- .../ant/taskdefs/optional/i18n/TranslateTest.java | 17 ++++++++--------- .../tools/ant/taskdefs/optional/ssh/ScpTest.java | 4 +--- 5 files changed, 14 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/44cb3984/src/tests/junit/org/apache/tools/ant/taskdefs/FilterTest.java ---------------------------------------------------------------------- diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/FilterTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/FilterTest.java index f20d9d5..a9ddbcb 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/FilterTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/FilterTest.java @@ -20,7 +20,6 @@ package org.apache.tools.ant.taskdefs; import java.io.BufferedReader; import java.io.File; -import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/ant/blob/44cb3984/src/tests/junit/org/apache/tools/ant/taskdefs/ProtectedJarMethodsTest.java ---------------------------------------------------------------------- diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ProtectedJarMethodsTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ProtectedJarMethodsTest.java index 032203a..55d5479 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/ProtectedJarMethodsTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ProtectedJarMethodsTest.java @@ -40,8 +40,6 @@ public class ProtectedJarMethodsTest { @Rule public final BuildFileRule buildRule = new BuildFileRule(); - private static String tempJar = "tmp.jar"; - @Before public void setUp() { @@ -52,6 +50,7 @@ public class ProtectedJarMethodsTest { @Test public void testGrabFilesAndDirs() throws IOException { buildRule.executeTarget("testIndexTests"); + String tempJar = "tmp.jar"; String archive = buildRule.getProject().getProperty(tempJar); List<String> dirs = new ArrayList<>(); List<String> files = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/ant/blob/44cb3984/src/tests/junit/org/apache/tools/ant/taskdefs/optional/ReplaceRegExpTest.java ---------------------------------------------------------------------- diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/ReplaceRegExpTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/ReplaceRegExpTest.java index 96b55e5..1dc7b01 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/ReplaceRegExpTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/ReplaceRegExpTest.java @@ -52,15 +52,9 @@ public class ReplaceRegExpTest { @Test public void testReplace() throws IOException { Properties original = new Properties(); - FileInputStream propsFile = null; - try { - propsFile = new FileInputStream(new File(buildRule.getProject().getBaseDir() + "/replaceregexp.properties")); + try (FileInputStream propsFile = new FileInputStream(new File( + buildRule.getProject().getBaseDir() + "/replaceregexp.properties"))) { original.load(propsFile); - } finally { - if (propsFile != null) { - propsFile.close(); - propsFile = null; - } } assertEquals("Def", original.get("OldAbc")); @@ -68,13 +62,9 @@ public class ReplaceRegExpTest { buildRule.executeTarget("testReplace"); Properties after = new Properties(); - try { - propsFile = new FileInputStream(new File(buildRule.getOutputDir(), "test.properties")); + try (FileInputStream propsFile = new FileInputStream(new File(buildRule.getOutputDir(), + "test.properties"))) { after.load(propsFile); - } finally { - if (propsFile != null) { - propsFile.close(); - } } assertNull(after.get("OldAbc")); http://git-wip-us.apache.org/repos/asf/ant/blob/44cb3984/src/tests/junit/org/apache/tools/ant/taskdefs/optional/i18n/TranslateTest.java ---------------------------------------------------------------------- diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/i18n/TranslateTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/i18n/TranslateTest.java index 63e0943..99ff85b 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/i18n/TranslateTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/i18n/TranslateTest.java @@ -69,15 +69,14 @@ public class TranslateTest { byte[] buffer1 = new byte[BUF_SIZE]; byte[] buffer2 = new byte[BUF_SIZE]; - try (FileInputStream fis1 = new FileInputStream(file1)) { - try (FileInputStream fis2 = new FileInputStream(file2)) { - int read = 0; - while ((read = fis1.read(buffer1)) != -1) { - fis2.read(buffer2); - for (int i = 0; i < read; ++i) { - if (buffer1[i] != buffer2[i]) { - return false; - } + try (FileInputStream fis1 = new FileInputStream(file1); + FileInputStream fis2 = new FileInputStream(file2)) { + int read = 0; + while ((read = fis1.read(buffer1)) != -1) { + fis2.read(buffer2); + for (int i = 0; i < read; ++i) { + if (buffer1[i] != buffer2[i]) { + return false; } } } http://git-wip-us.apache.org/repos/asf/ant/blob/44cb3984/src/tests/junit/org/apache/tools/ant/taskdefs/optional/ssh/ScpTest.java ---------------------------------------------------------------------- diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/ssh/ScpTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/ssh/ScpTest.java index 03edb37..5c6d9d0 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/ssh/ScpTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/ssh/ScpTest.java @@ -171,11 +171,9 @@ public class ScpTest { /** * Expected failure due to invalid remoteToDir - * - * @throws IOException */ @Test(expected = BuildException.class) - public void testInvalidRemoteToDir() throws IOException { + public void testInvalidRemoteToDir() { scpTask.setRemoteTodir("host:/a/path/without/an/at"); }
