sbailliez 02/02/11 14:48:28
Modified:
proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit
BaseTestElement.java
Log:
Fix shouldRun logic.
Revision Changes Path
1.2 +6 -2
jakarta-ant/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/BaseTestElement.java
Index: BaseTestElement.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/proposal/sandbox/junit/src/main/org/apache/tools/ant/taskdefs/optional/rjunit/BaseTestElement.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BaseTestElement.java 10 Feb 2002 21:38:58 -0000 1.1
+++ BaseTestElement.java 11 Feb 2002 22:48:28 -0000 1.2
@@ -105,8 +105,12 @@
*/
protected boolean shouldRun() {
final Project project = getProject();
- if ((project.getProperty(ifProperty) == null) ||
- (project.getProperty(unlessProperty) != null)) {
+ if ( ifProperty != null &&
+ project.getProperty(ifProperty) == null ){
+ return false;
+ }
+ if (unlessProperty != null &&
+ project.getProperty(unlessProperty) != null) {
return false;
}
return true;
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
