From 16db8f8d233163736d931bded2224bd85a33c41b Mon Sep 17 00:00:00 2001
From: Matthew Jason Benson <mbenson@apache.org>
Date: Wed, 27 Jun 2007 22:47:24 +0000
Subject: [PATCH] antunitize scriptcondition test

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@551372 13f79535-47bb-0310-9956-ffa450edef68
---
 src/etc/testcases/types/scriptcondition.xml   | 77 -------------------
 .../antunit/types/scriptcondition-test.xml    | 73 ++++++++++++++++++
 .../types/optional/ScriptConditionTest.java   | 62 ---------------
 3 files changed, 73 insertions(+), 139 deletions(-)
 delete mode 100644 src/etc/testcases/types/scriptcondition.xml
 create mode 100644 src/tests/antunit/types/scriptcondition-test.xml
 delete mode 100644 src/tests/junit/org/apache/tools/ant/types/optional/ScriptConditionTest.java

diff --git a/src/etc/testcases/types/scriptcondition.xml b/src/etc/testcases/types/scriptcondition.xml
deleted file mode 100644
index f1b6770d0..000000000
--- a/src/etc/testcases/types/scriptcondition.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<project name="testscriptcondition" >
-
-
-  <macrodef name="t">
-    <element name="test" implicit="yes" />
-    <attribute name="message"/>
-    <sequential>
-      <fail message="query @{message} failed; result was false">
-        <condition>
-          <not>
-            <test />
-          </not>
-        </condition>
-      </fail>
-    </sequential>
-  </macrodef>  
-
-  <macrodef name="f">
-    <element name="test" implicit="yes" />
-    <attribute name="message"/>
-    <sequential>
-      <fail message="test @{message} failed; result was true">
-        <condition>
-          <test/>
-        </condition>
-      </fail>
-    </sequential>
-  </macrodef>  
-  
-  <!-- this is here to test the macro is well coded -->
- <target name="testMacro">
-    <t message="testMacro" >
-        <istrue value="true"/>
-    </t>
-    <f message="testMacro2" >
-        <istrue value="false"/>
-    </f>
-  </target>  
-
- <target name="testNolanguage">
-    <t message="testNolanguage" >
-      <scriptcondition >
-        self.setValue(true);
-      </scriptcondition>
-    </t>
-  </target>
-
-  <target name="testClearByDefault">
-    <f message="testClearByDefault" >
-      <scriptcondition language="javascript">
-      </scriptcondition>
-    </f>
-  </target>  
-  
-  <target name="testValueWorks">
-    <t message="testValueWorks" >
-      <scriptcondition language="javascript"
-        value="true" />
-    </t>
-  </target>    
-  
-  <target name="testSetWorks">
-    <t message="testSetWorks" >
-      <scriptcondition language="javascript" value="false">
-        self.setValue(true);
-      </scriptcondition>
-    </t>
-  </target>
-
-  <target name="testClearWorks">
-    <f message="testClearWorks">
-      <scriptcondition language="javascript" value="true">
-        self.setValue(false);
-      </scriptcondition>
-    </f>
-  </target>  
-</project>
diff --git a/src/tests/antunit/types/scriptcondition-test.xml b/src/tests/antunit/types/scriptcondition-test.xml
new file mode 100644
index 000000000..abbe13441
--- /dev/null
+++ b/src/tests/antunit/types/scriptcondition-test.xml
@@ -0,0 +1,73 @@
+<project name="scriptcondition-test" default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
+  <import file="../antunit-base.xml" />
+
+  <macrodef name="t">
+    <element name="test" implicit="yes" />
+    <attribute name="message"/>
+    <sequential>
+      <au:assertTrue message="query @{message} failed; result was false">
+        <test />
+      </au:assertTrue>
+    </sequential>
+  </macrodef>
+
+  <macrodef name="f">
+    <element name="test" implicit="yes" />
+    <attribute name="message"/>
+    <sequential>
+      <au:assertFalse message="test @{message} failed; result was true">
+        <test />
+      </au:assertFalse>
+    </sequential>
+  </macrodef>
+
+  <!-- this is here to test the macro is well coded -->
+ <target name="testMacro">
+    <t message="testMacro">
+      <istrue value="true"/>
+    </t>
+    <f message="testMacro2">
+      <istrue value="false"/>
+    </f>
+  </target>
+
+ <target name="testNolanguage">
+    <au:expectfailure message="Absence of language attribute not detected"
+                           expectedMessage="script language must be specified">
+      <t message="testNolanguage">
+        <scriptcondition>
+          self.setValue(true);
+        </scriptcondition>
+      </t>
+    </au:expectfailure>
+  </target>
+
+  <target name="testClearByDefault">
+    <f message="testClearByDefault">
+      <scriptcondition language="javascript">
+      </scriptcondition>
+    </f>
+  </target>
+
+  <target name="testValueWorks">
+    <t message="testValueWorks">
+      <scriptcondition language="javascript" value="true" />
+    </t>
+  </target>
+
+  <target name="testSetWorks">
+    <t message="testSetWorks">
+      <scriptcondition language="javascript" value="false">
+        self.setValue(true);
+      </scriptcondition>
+    </t>
+  </target>
+
+  <target name="testClearWorks">
+    <f message="testClearWorks">
+      <scriptcondition language="javascript" value="true">
+        self.setValue(false);
+      </scriptcondition>
+    </f>
+  </target>
+</project>
diff --git a/src/tests/junit/org/apache/tools/ant/types/optional/ScriptConditionTest.java b/src/tests/junit/org/apache/tools/ant/types/optional/ScriptConditionTest.java
deleted file mode 100644
index e4d160d37..000000000
--- a/src/tests/junit/org/apache/tools/ant/types/optional/ScriptConditionTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You 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 org.apache.tools.ant.types.optional;
-
-import org.apache.tools.ant.BuildFileTest;
-
-/**
- */
-public class ScriptConditionTest extends BuildFileTest {
-    /**
-     * Constructor for the BuildFileTest object
-     *
-     * @param name string to pass up to TestCase constructor
-     */
-    public ScriptConditionTest(String name) {
-        super(name);
-    }
-
-    public void setUp() {
-        configureProject("src/etc/testcases/types/scriptcondition.xml");
-    }
-
-    public void testNolanguage() {
-        expectBuildExceptionContaining("testNolanguage",
-                "Absence of language attribute not detected",
-                "script language must be specified");
-    }
-
-    public void testMacro() {
-        executeTarget("testMacro");
-    }
-    public void testClearByDefault() {
-        executeTarget("testClearByDefault");
-    }
-    public void testValueWorks() {
-        executeTarget("testValueWorks");
-    }
-
-    public void testSetWorks() {
-        executeTarget("testSetWorks");
-    }
-
-    public void testClearWorks() {
-        executeTarget("testClearWorks");
-    }
-
-}