From b1e478fd6c05115eb8640d7c1de1781a4ba80080 Mon Sep 17 00:00:00 2001 From: Stefan Bodewig Date: Fri, 4 Apr 2008 10:47:22 +0000 Subject: [PATCH] disable FailureRecorder test when running JUnit4 git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@644677 13f79535-47bb-0310-9956-ffa450edef68 --- .../ant/taskdefs/optional/junit/JUnitTaskTest.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 6eead3993..a8fc76d8b 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 @@ -24,6 +24,7 @@ import java.io.IOException; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.BuildFileTest; +import org.apache.tools.ant.util.JavaEnvUtils; public class JUnitTaskTest extends BuildFileTest { @@ -100,6 +101,17 @@ public class JUnitTaskTest extends BuildFileTest { // $ ant -f junit.xml failureRecorder.runtest // But running the JUnit testcase fails in 4th run. public void testFailureRecorder() { + if (JavaEnvUtils.isAtLeastJavaVersion(JavaEnvUtils.JAVA_1_5)) { + try { + Class.forName("junit.framework.JUnit4TestAdapter"); + System.err.println("skipping tests since it fails when" + + " using JUnit 4"); + return; + } catch (ClassNotFoundException e) { + // OK, this is JUnit3, can run test + } + } + try { File testDir = new File(getProjectDir(), "out"); File collectorFile = new File(getProjectDir(),