From 22a05c5bafcdcfee2a54a1faaaf0e02e515b2ba4 Mon Sep 17 00:00:00 2001
From: Gintas Grigelionis <gintas@apache.org>
Date: Thu, 26 Apr 2018 17:10:34 +0200
Subject: [PATCH] Tidy up the code

---
 .../org/apache/tools/ant/taskdefs/ExecStreamRedirectorTest.java | 2 --
 .../org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java      | 2 +-
 src/tests/junit/org/apache/tools/ant/taskdefs/FilterTest.java   | 1 -
 src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java      | 1 -
 .../apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java | 2 +-
 .../junit/org/apache/tools/ant/types/ResourceOutputTest.java    | 2 +-
 src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java      | 1 -
 7 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ExecStreamRedirectorTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ExecStreamRedirectorTest.java
index 36ee23489..f69e6e250 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/ExecStreamRedirectorTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ExecStreamRedirectorTest.java
@@ -1,8 +1,6 @@
 package org.apache.tools.ant.taskdefs;
 
 import org.apache.tools.ant.BuildFileRule;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.ProjectHelper;
 import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java
index 4d912718f..1639e1b91 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ExecuteWatchdogTest.java
@@ -74,7 +74,7 @@ public class ExecuteWatchdogTest {
         return Runtime.getRuntime().exec(cmdArray);
     }
 
-    private String getErrorOutput(Process p) throws Exception {
+    private String getErrorOutput(Process p) {
         BufferedReader err = new BufferedReader(new InputStreamReader(p.getErrorStream()));
         return err.lines().collect(Collectors.joining());
     }
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 a9ddbcb0d..76aa27b60 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/FilterTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/FilterTest.java
@@ -31,7 +31,6 @@ import org.junit.Rule;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java
index a3f8520da..726a289b7 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java
@@ -25,7 +25,6 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.IOException;
 import java.util.Collections;
-import java.util.Enumeration;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
index c9aed1a4d..e72d58003 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
@@ -585,7 +585,7 @@ public class JUnitTaskTest {
     }
 
     @Test
-    public void testCheckDuplicateAntJar() throws Exception {
+    public void testCheckDuplicateAntJar() {
         setupCheckDuplicateTest();
         buildRule.executeTarget("testCheckForkedPath");
         assertThat("Expecting the warning about the duplicate ant jar", buildRule.getLog(),
diff --git a/src/tests/junit/org/apache/tools/ant/types/ResourceOutputTest.java b/src/tests/junit/org/apache/tools/ant/types/ResourceOutputTest.java
index a827209a0..225e80f36 100644
--- a/src/tests/junit/org/apache/tools/ant/types/ResourceOutputTest.java
+++ b/src/tests/junit/org/apache/tools/ant/types/ResourceOutputTest.java
@@ -110,7 +110,7 @@ public class ResourceOutputTest {
     }
 
     @Test
-    public void testpropertyoutput3() throws IOException {
+    public void testpropertyoutput3() {
         project.setNewProperty("bar", "bar");
         assertEquals("bar", project.getProperty("bar"));
     }
diff --git a/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java b/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java
index 15efb17d2..f58b77503 100644
--- a/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java
+++ b/src/tests/junit/org/apache/tools/zip/UTF8ZipFilesTest.java
@@ -23,7 +23,6 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.nio.ByteBuffer;
 import java.util.Collections;
-import java.util.Enumeration;
 import java.util.zip.CRC32;
 import org.junit.Test;