Browse Source

Use the context rather than the project

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271317 13f79535-47bb-0310-9956-ffa450edef68
master
Peter Donald 24 years ago
parent
commit
c86c8e4a72
4 changed files with 14 additions and 8 deletions
  1. +3
    -1
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
  2. +4
    -3
      proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
  3. +3
    -1
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
  4. +4
    -3
      proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java

+ 3
- 1
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java View File

@@ -21,6 +21,7 @@ import java.util.Properties;
import java.util.Random; import java.util.Random;
import org.apache.aut.nativelib.ExecManager; import org.apache.aut.nativelib.ExecManager;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.api.TaskContext;
import org.apache.tools.ant.Task; import org.apache.tools.ant.Task;
import org.apache.myrmidon.framework.Execute; import org.apache.myrmidon.framework.Execute;
import org.apache.tools.ant.taskdefs.exec.LogOutputStream; import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
@@ -390,7 +391,8 @@ public class JUnitTask extends Task
while( list.hasNext() ) while( list.hasNext() )
{ {
JUnitTest test = (JUnitTest)list.next(); JUnitTest test = (JUnitTest)list.next();
if( test.shouldRun( null ) )
final TaskContext context = getContext();
if( test.shouldRun( context ) )
{ {
execute( test ); execute( test );
} }


+ 4
- 3
proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java View File

@@ -12,6 +12,7 @@ import java.util.Hashtable;
import java.util.Iterator; import java.util.Iterator;
import java.util.Properties; import java.util.Properties;
import org.apache.tools.ant.Project; import org.apache.tools.ant.Project;
import org.apache.myrmidon.api.TaskContext;


/** /**
* <p> * <p>
@@ -161,14 +162,14 @@ public class JUnitTest extends BaseTest
return m_runs; return m_runs;
} }


public boolean shouldRun( Project p )
public boolean shouldRun( final TaskContext context )
{ {
if( ifProperty != null && p.getProperty( ifProperty ) == null )
if( ifProperty != null && context.getProperty( ifProperty ) == null )
{ {
return false; return false;
} }
else if( unlessProperty != null && else if( unlessProperty != null &&
p.getProperty( unlessProperty ) != null )
context.getProperty( unlessProperty ) != null )
{ {
return false; return false;
} }


+ 3
- 1
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java View File

@@ -21,6 +21,7 @@ import java.util.Properties;
import java.util.Random; import java.util.Random;
import org.apache.aut.nativelib.ExecManager; import org.apache.aut.nativelib.ExecManager;
import org.apache.myrmidon.api.TaskException; import org.apache.myrmidon.api.TaskException;
import org.apache.myrmidon.api.TaskContext;
import org.apache.tools.ant.Task; import org.apache.tools.ant.Task;
import org.apache.myrmidon.framework.Execute; import org.apache.myrmidon.framework.Execute;
import org.apache.tools.ant.taskdefs.exec.LogOutputStream; import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
@@ -390,7 +391,8 @@ public class JUnitTask extends Task
while( list.hasNext() ) while( list.hasNext() )
{ {
JUnitTest test = (JUnitTest)list.next(); JUnitTest test = (JUnitTest)list.next();
if( test.shouldRun( null ) )
final TaskContext context = getContext();
if( test.shouldRun( context ) )
{ {
execute( test ); execute( test );
} }


+ 4
- 3
proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java View File

@@ -12,6 +12,7 @@ import java.util.Hashtable;
import java.util.Iterator; import java.util.Iterator;
import java.util.Properties; import java.util.Properties;
import org.apache.tools.ant.Project; import org.apache.tools.ant.Project;
import org.apache.myrmidon.api.TaskContext;


/** /**
* <p> * <p>
@@ -161,14 +162,14 @@ public class JUnitTest extends BaseTest
return m_runs; return m_runs;
} }


public boolean shouldRun( Project p )
public boolean shouldRun( final TaskContext context )
{ {
if( ifProperty != null && p.getProperty( ifProperty ) == null )
if( ifProperty != null && context.getProperty( ifProperty ) == null )
{ {
return false; return false;
} }
else if( unlessProperty != null && else if( unlessProperty != null &&
p.getProperty( unlessProperty ) != null )
context.getProperty( unlessProperty ) != null )
{ {
return false; return false;
} }


Loading…
Cancel
Save