From c6c81da5f4d9ace244bc303cbb080ef177384eb6 Mon Sep 17 00:00:00 2001 From: Gintas Grigelionis Date: Sun, 29 Apr 2018 22:43:45 +0200 Subject: [PATCH 1/3] =?UTF-8?q?Re-activate=20a=20=E2=80=9Cforgotten?= =?UTF-8?q?=E2=80=9D=20test?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../junit/org/apache/tools/ant/taskdefs/ZipExtraFieldTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ZipExtraFieldTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ZipExtraFieldTest.java index ff3b0e422..dcf4e38c4 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/ZipExtraFieldTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ZipExtraFieldTest.java @@ -46,6 +46,7 @@ public class ZipExtraFieldTest { testExtraField(new Zip(), true); } + @Test public void testDoesntCreateZip64ExtraFieldForJar() throws IOException { testExtraField(new Jar(), false); } From e30f48346920c8253e41d130770bed42a55aa94e Mon Sep 17 00:00:00 2001 From: Gintas Grigelionis Date: Wed, 2 May 2018 06:03:04 +0200 Subject: [PATCH 2/3] Fix a copy-paste error (cherry-picked from master) --- .../apache/tools/ant/taskdefs/optional/jdepend/JDependTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTest.java index df4dccdd6..13691fc6d 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/jdepend/JDependTest.java @@ -82,7 +82,7 @@ public class JDependTest { */ @Test public void testTimeout() { - buildRule.executeTarget("fork-xml"); + buildRule.executeTarget("fork-timeout"); AntAssert.assertContains("JDepend FAILED - Timed out", buildRule.getLog()); } From ab2a5096c889863f0eee5df2df8a4abd5ccccbad Mon Sep 17 00:00:00 2001 From: Gintas Grigelionis Date: Mon, 30 Apr 2018 06:44:05 +0200 Subject: [PATCH 3/3] Remove a duplicate line --- src/tests/junit/org/apache/tools/ant/taskdefs/ExecTaskTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ExecTaskTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ExecTaskTest.java index d44f51450..95b2ca99c 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/ExecTaskTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ExecTaskTest.java @@ -133,7 +133,6 @@ public class ExecTaskTest { myBuildFile = buildFile; this.target = target; project = new Project(); - project = new Project(); project.init(); project.setUserProperty("ant.file", myBuildFile.getAbsolutePath()); ProjectHelper.configureProject(project, myBuildFile);