diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java index ce2f12060..650497916 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.Project; import org.apache.tools.ant.types.FileSet; @@ -39,21 +39,6 @@ public final class BatchTest extends BaseTest */ private ArrayList filesets = new ArrayList(); - /** - * the reference to the project - */ - private Project project; - - /** - * create a new batchtest instance - * - * @param project the project it depends on. - */ - public BatchTest( Project project ) - { - this.project = project; - } - /** * Convenient method to convert a pathname without extension to a fully * qualified classname. For example org/apache/Whatever will be diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java index fab1722f8..60ea5248c 100644 --- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java +++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java @@ -336,7 +336,7 @@ public class JUnitTask extends Task */ public BatchTest createBatchTest() { - BatchTest test = new BatchTest( getProject() ); + BatchTest test = new BatchTest(); batchTests.add( test ); return test; } @@ -384,7 +384,7 @@ public class JUnitTask extends Task while( list.hasNext() ) { JUnitTest test = (JUnitTest)list.next(); - if( test.shouldRun( getProject() ) ) + if( test.shouldRun( null ) ) { execute( test ); } diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java index ce2f12060..650497916 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/BatchTest.java @@ -12,7 +12,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; import org.apache.myrmidon.api.TaskException; -import org.apache.tools.ant.DirectoryScanner; +import org.apache.tools.ant.types.DirectoryScanner; import org.apache.tools.ant.Project; import org.apache.tools.ant.types.FileSet; @@ -39,21 +39,6 @@ public final class BatchTest extends BaseTest */ private ArrayList filesets = new ArrayList(); - /** - * the reference to the project - */ - private Project project; - - /** - * create a new batchtest instance - * - * @param project the project it depends on. - */ - public BatchTest( Project project ) - { - this.project = project; - } - /** * Convenient method to convert a pathname without extension to a fully * qualified classname. For example org/apache/Whatever will be diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java index fab1722f8..60ea5248c 100644 --- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java +++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java @@ -336,7 +336,7 @@ public class JUnitTask extends Task */ public BatchTest createBatchTest() { - BatchTest test = new BatchTest( getProject() ); + BatchTest test = new BatchTest(); batchTests.add( test ); return test; } @@ -384,7 +384,7 @@ public class JUnitTask extends Task while( list.hasNext() ) { JUnitTest test = (JUnitTest)list.next(); - if( test.shouldRun( getProject() ) ) + if( test.shouldRun( null ) ) { execute( test ); }