Adding conditions in, and implementing test running

git-svn-id: file:///home/sven/projects/JOGL/temp/ant-contrib/svn/ant-contrib-code/trunk/ant-contrib@6 32d7a393-a5a9-423c-abd3-5d954feb1f2f

6 files changed, 322 insertions, 2 deletions

diff --git a/src/java/net/sf/antcontrib/logic/Assert.java b/src/java/net/sf/antcontrib/logic/Assert.java
index 38ac6e8..eb5654a 100644
--- a/src/java/net/sf/antcontrib/logic/Assert.java
+++ b/src/java/net/sf/antcontrib/logic/Assert.java
@@ -19,20 +19,21 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
+import net.sf.antcontrib.logic.condition.BooleanConditionBase;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.TaskContainer;
 import org.apache.tools.ant.taskdefs.Exit;
 import org.apache.tools.ant.taskdefs.Sequential;
 import org.apache.tools.ant.taskdefs.condition.Condition;
-import org.apache.tools.ant.taskdefs.condition.ConditionBase;
 
 
 /**
  *
  */
 public class Assert
-	extends ConditionBase
+	extends BooleanConditionBase
 	implements TaskContainer {
 
 	private List tasks = new ArrayList();
diff --git a/src/java/net/sf/antcontrib/logic/condition/BooleanConditionBase.java b/src/java/net/sf/antcontrib/logic/condition/BooleanConditionBase.java
new file mode 100644
index 0000000..f99f819
--- /dev/null
+++ b/src/java/net/sf/antcontrib/logic/condition/BooleanConditionBase.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2001-2004 Ant-Contrib project.  All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package net.sf.antcontrib.logic.condition;
+
+import org.apache.tools.ant.taskdefs.condition.ConditionBase;
+
+/**
+ * Extends ConditionBase so I can get access to the condition count and the
+ * first condition. This is the class that the BooleanConditionTask is proxy
+ * for.
+ * <p>Developed for use with Antelope, migrated to ant-contrib Oct 2003.
+ *
+ * @author     Dale Anson, [email protected]
+ */
+public class BooleanConditionBase extends ConditionBase {
+   /**
+    * Adds a feature to the IsPropertyTrue attribute of the BooleanConditionBase
+    * object
+    *
+    * @param i  The feature to be added to the IsPropertyTrue attribute
+    */
+   public void addIsPropertyTrue( IsPropertyTrue i ) {
+      super.add( i );
+   }
+
+   /**
+    * Adds a feature to the IsPropertyFalse attribute of the
+    * BooleanConditionBase object
+    *
+    * @param i  The feature to be added to the IsPropertyFalse attribute
+    */
+   public void addIsPropertyFalse( IsPropertyFalse i ) {
+      super.add( i );
+   }
+   
+   public void addIsGreaterThan( IsGreaterThan i) {
+      super.add(i);  
+   }
+   
+   public void addIsLessThan( IsLessThan i) {
+      super.add(i);  
+   }
+}
+
diff --git a/src/java/net/sf/antcontrib/logic/condition/IsGreaterThan.java b/src/java/net/sf/antcontrib/logic/condition/IsGreaterThan.java
new file mode 100644
index 0000000..d360825
--- /dev/null
+++ b/src/java/net/sf/antcontrib/logic/condition/IsGreaterThan.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2001-2004 Ant-Contrib project.  All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package net.sf.antcontrib.logic.condition;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.taskdefs.condition.Equals;
+
+/**
+ * Extends Equals condition to test if the first argument is greater than the
+ * second argument. Will deal with base 10 integer and decimal numbers, otherwise,
+ * treats arguments as Strings.
+ * <p>Developed for use with Antelope, migrated to ant-contrib Oct 2003.
+ *
+ * @author     Dale Anson, [email protected]
+ * @version $Revision: 1.4 $
+ */
+public class IsGreaterThan extends Equals {
+
+    private String arg1, arg2;
+    private boolean trim = false;
+    private boolean caseSensitive = true;
+
+    public void setArg1(String a1) {
+        arg1 = a1;
+    }
+
+    public void setArg2(String a2) {
+        arg2 = a2;
+    }
+
+    /**
+     * Should we want to trim the arguments before comparing them?
+     *
+     * @since Revision: 1.3, Ant 1.5
+     */
+    public void setTrim(boolean b) {
+        trim = b;
+    }
+
+    /**
+     * Should the comparison be case sensitive?
+     *
+     * @since Revision: 1.3, Ant 1.5
+     */
+    public void setCasesensitive(boolean b) {
+        caseSensitive = b;
+    }
+
+    public boolean eval() throws BuildException {
+        if (arg1 == null || arg2 == null) {
+            throw new BuildException("both arg1 and arg2 are required in "
+                                     + "greater than");
+        }
+
+        if (trim) {
+            arg1 = arg1.trim();
+            arg2 = arg2.trim();
+        }
+        
+        // check if args are numbers
+        try {
+            double num1 = Double.parseDouble(arg1);
+            double num2 = Double.parseDouble(arg2);
+            return num1 > num2;
+        }
+        catch(NumberFormatException nfe) {
+            // ignored, fall thru to string comparision       
+        }
+        
+        return caseSensitive ? arg1.compareTo(arg2) > 0 : arg1.compareToIgnoreCase(arg2) > 0;
+    }
+
+}
diff --git a/src/java/net/sf/antcontrib/logic/condition/IsLessThan.java b/src/java/net/sf/antcontrib/logic/condition/IsLessThan.java
new file mode 100644
index 0000000..64c676c
--- /dev/null
+++ b/src/java/net/sf/antcontrib/logic/condition/IsLessThan.java
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2001-2004 Ant-Contrib project.  All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package net.sf.antcontrib.logic.condition;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.taskdefs.condition.Equals;
+
+/**
+ * Extends Equals condition to test if the first argument is less than the
+ * second argument. Will deal with base 10 integer and decimal numbers, otherwise,
+ * treats arguments as Strings.
+ * <p>Developed for use with Antelope, migrated to ant-contrib Oct 2003.
+ *
+ * @author     Dale Anson, [email protected]
+ * @version $Revision: 1.4 $
+ */
+public class IsLessThan extends Equals {
+
+    private String arg1, arg2;
+    private boolean trim = false;
+    private boolean caseSensitive = true;
+
+    public void setArg1(String a1) {
+        arg1 = a1;
+    }
+
+    public void setArg2(String a2) {
+        arg2 = a2;
+    }
+
+    /**
+     * Should we want to trim the arguments before comparing them?
+     *
+     * @since Revision: 1.3, Ant 1.5
+     */
+    public void setTrim(boolean b) {
+        trim = b;
+    }
+
+    /**
+     * Should the comparison be case sensitive?
+     *
+     * @since Revision: 1.3, Ant 1.5
+     */
+    public void setCasesensitive(boolean b) {
+        caseSensitive = b;
+    }
+
+    public boolean eval() throws BuildException {
+        if (arg1 == null || arg2 == null) {
+            throw new BuildException("both arg1 and arg2 are required in "
+                                     + "less than");
+        }
+
+        if (trim) {
+            arg1 = arg1.trim();
+            arg2 = arg2.trim();
+        }
+        
+        // check if args are numbers
+        try {
+            double num1 = Double.parseDouble(arg1);
+            double num2 = Double.parseDouble(arg2);
+            return num1 < num2;
+        }
+        catch(NumberFormatException nfe) {
+            // ignored, fall thru to string comparision       
+        }
+        
+        return caseSensitive ? arg1.compareTo(arg2) < 0 : arg1.compareToIgnoreCase(arg2) < 0;
+    }
+
+}
diff --git a/src/java/net/sf/antcontrib/logic/condition/IsPropertyFalse.java b/src/java/net/sf/antcontrib/logic/condition/IsPropertyFalse.java
new file mode 100644
index 0000000..479f9fd
--- /dev/null
+++ b/src/java/net/sf/antcontrib/logic/condition/IsPropertyFalse.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2001-2004 Ant-Contrib project.  All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package net.sf.antcontrib.logic.condition;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.taskdefs.condition.IsFalse;
+
+/**
+ * Extends IsFalse condition to check the value of a specified property.
+ * <p>Developed for use with Antelope, migrated to ant-contrib Oct 2003.
+ *
+ * @author     Dale Anson, [email protected]
+ * @version $Revision: 1.3 $
+ */
+public class IsPropertyFalse extends IsFalse {
+    
+    private String name = null;
+    
+    public void setProperty(String name) {
+        this.name = name;   
+    }
+    
+    public boolean eval() throws BuildException {
+        if (name == null)
+            throw new BuildException("Property name must be set.");
+        String value = getProject().getProperty(name);
+        if (value == null)
+            return true;
+        return !getProject().toBoolean(value);
+    }
+
+}
diff --git a/src/java/net/sf/antcontrib/logic/condition/IsPropertyTrue.java b/src/java/net/sf/antcontrib/logic/condition/IsPropertyTrue.java
new file mode 100644
index 0000000..d1060ab
--- /dev/null
+++ b/src/java/net/sf/antcontrib/logic/condition/IsPropertyTrue.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2001-2004 Ant-Contrib project.  All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package net.sf.antcontrib.logic.condition;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.taskdefs.condition.IsTrue;
+
+/**
+ * Extends IsTrue condition to check the value of a specified property.
+ * <p>Developed for use with Antelope, migrated to ant-contrib Oct 2003.
+ *
+ * @author     Dale Anson, [email protected]
+ * @version $Revision: 1.3 $
+ */
+public class IsPropertyTrue extends IsTrue {
+
+    private String name = null;
+
+    public void setProperty( String name ) {
+        this.name = name;
+    }
+
+    public boolean eval() throws BuildException {
+        if ( name == null )
+            throw new BuildException( "Property name must be set." );
+        String value = getProject().getProperty( name );
+        if ( value == null )
+            return false;
+        return getProject().toBoolean( value );
+    }
+
+}