From 3822ba4a356bb787b7a9a141526184cc431ec9e9 Mon Sep 17 00:00:00 2001 From: Peter Reilly Date: Sat, 7 Oct 2006 21:34:43 +0000 Subject: [PATCH] Fix for junit4 in JUnit4 annotations are placed in org.junit, so this package needs to be made a "systempackage" for fork=no to work. Bugzilla report 40697 git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@454027 13f79535-47bb-0310-9956-ffa450edef68 --- WHATSNEW | 3 +++ .../apache/tools/ant/taskdefs/optional/junit/JUnitTask.java | 2 ++ 2 files changed, 5 insertions(+) diff --git a/WHATSNEW b/WHATSNEW index f9b434c10..2dcc80615 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -45,6 +45,9 @@ Fixed bugs: * Error in duplicate project name with and . Bugzilla report 39920. +* junit4 did not work with fork=no and junit4 in $ANT_HOME/lib. + Bugzilla report 40697. + Other changes: -------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java index 887db1206..add0ce01b 100644 --- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java +++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java @@ -1444,6 +1444,8 @@ public class JUnitTask extends Task { Project.MSG_VERBOSE); // make sure the test will be accepted as a TestCase classLoader.addSystemPackageRoot("junit"); + // make sure the test annotation are accepted + classLoader.addSystemPackageRoot("org.junit"); // will cause trouble in JDK 1.1 if omitted classLoader.addSystemPackageRoot("org.apache.tools.ant"); }