From c86c8e4a72ee08b3659453fc8e9cd5fde5315ccd Mon Sep 17 00:00:00 2001
From: Peter Donald <donaldp@apache.org>
Date: Thu, 14 Feb 2002 09:34:27 +0000
Subject: [PATCH] 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
---
 .../tools/ant/taskdefs/optional/junit/JUnitTask.java       | 4 +++-
 .../tools/ant/taskdefs/optional/junit/JUnitTest.java       | 7 ++++---
 .../tools/ant/taskdefs/optional/junit/JUnitTask.java       | 4 +++-
 .../tools/ant/taskdefs/optional/junit/JUnitTest.java       | 7 ++++---
 4 files changed, 14 insertions(+), 8 deletions(-)

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 c9070d702..0b43e11a4 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
@@ -21,6 +21,7 @@ import java.util.Properties;
 import java.util.Random;
 import org.apache.aut.nativelib.ExecManager;
 import org.apache.myrmidon.api.TaskException;
+import org.apache.myrmidon.api.TaskContext;
 import org.apache.tools.ant.Task;
 import org.apache.myrmidon.framework.Execute;
 import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
@@ -390,7 +391,8 @@ public class JUnitTask extends Task
         while( list.hasNext() )
         {
             JUnitTest test = (JUnitTest)list.next();
-            if( test.shouldRun( null ) )
+            final TaskContext context = getContext();
+            if( test.shouldRun( context ) )
             {
                 execute( test );
             }
diff --git a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
index dce8b5379..0861b992f 100644
--- a/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
+++ b/proposal/myrmidon/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
@@ -12,6 +12,7 @@ import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Properties;
 import org.apache.tools.ant.Project;
+import org.apache.myrmidon.api.TaskContext;
 
 /**
  * <p>
@@ -161,14 +162,14 @@ public class JUnitTest extends BaseTest
         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;
         }
         else if( unlessProperty != null &&
-            p.getProperty( unlessProperty ) != null )
+            context.getProperty( unlessProperty ) != null )
         {
             return false;
         }
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 c9070d702..0b43e11a4 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
@@ -21,6 +21,7 @@ import java.util.Properties;
 import java.util.Random;
 import org.apache.aut.nativelib.ExecManager;
 import org.apache.myrmidon.api.TaskException;
+import org.apache.myrmidon.api.TaskContext;
 import org.apache.tools.ant.Task;
 import org.apache.myrmidon.framework.Execute;
 import org.apache.tools.ant.taskdefs.exec.LogOutputStream;
@@ -390,7 +391,8 @@ public class JUnitTask extends Task
         while( list.hasNext() )
         {
             JUnitTest test = (JUnitTest)list.next();
-            if( test.shouldRun( null ) )
+            final TaskContext context = getContext();
+            if( test.shouldRun( context ) )
             {
                 execute( test );
             }
diff --git a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
index dce8b5379..0861b992f 100644
--- a/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
+++ b/proposal/myrmidon/src/todo/org/apache/tools/ant/taskdefs/optional/junit/JUnitTest.java
@@ -12,6 +12,7 @@ import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.Properties;
 import org.apache.tools.ant.Project;
+import org.apache.myrmidon.api.TaskContext;
 
 /**
  * <p>
@@ -161,14 +162,14 @@ public class JUnitTest extends BaseTest
         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;
         }
         else if( unlessProperty != null &&
-            p.getProperty( unlessProperty ) != null )
+            context.getProperty( unlessProperty ) != null )
         {
             return false;
         }