From b38e6068cbb2cc97833a24a89b90fe1e53f7d246 Mon Sep 17 00:00:00 2001
From: Kevin Jackson <kevj@apache.org>
Date: Sat, 12 May 2007 04:31:40 +0000
Subject: [PATCH] -remove whitespace, use antunit-base.xml

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@537333 13f79535-47bb-0310-9956-ffa450edef68
---
 .../optional/script/scriptdef-test.xml        | 35 +++++++------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/src/tests/antunit/taskdefs/optional/script/scriptdef-test.xml b/src/tests/antunit/taskdefs/optional/script/scriptdef-test.xml
index 9ec4575a3..67caa46c3 100644
--- a/src/tests/antunit/taskdefs/optional/script/scriptdef-test.xml
+++ b/src/tests/antunit/taskdefs/optional/script/scriptdef-test.xml
@@ -1,17 +1,12 @@
-<project default="test" xmlns:au="antlib:org.apache.ant.antunit">
+<project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
 
+  <import file="../../../antunit-base.xml"/>	
+	
   <description>
     In which we test interesting aspects of scripting.
     The targeted language is javascript; this lets us run without
     additions on Java6+.
   </description>
-
-  <target name="test">
-    <au:antunit>
-      <fileset file="${ant.file}"/>
-      <au:plainlistener/>
-    </au:antunit>
-  </target>
   
   <target name="tearDown">
   </target>
@@ -34,7 +29,6 @@
   <property name="prop"
       value='self.log("Ant version =${ant.version}");project.setNewProperty("property","live");' />
 
-
   <presetdef name="assertPropSet">
     <au:assertPropertyEquals name="property" value="live" />
   </presetdef>
@@ -42,22 +36,19 @@
 
   <!--purely to test that everything works -->
   <target name="testInline">
-    <js > self.log("Hello");</js>
+    <js>self.log("Hello");</js>
     <scripttest/>
   </target>
 
-
   <target name="testStringResource">
-    <js >
+    <js>
       <string value='self.log("Ant version =${ant.version}");' />
     </js>
     <scripttest/>
   </target>
 
-
-
   <target name="testStringResourceRef">
-    <js >
+    <js>
       <string refid="script.code" />
     </js>
     <scripttest/>
@@ -65,27 +56,26 @@
   </target>
 
   <target name="testStringResourceInline">
-    <js >
-      <string >
+    <js>
+      <string>
         self.log("Ant version =${ant.version}");
         project.setNewProperty("property","live");
       </string>
     </js>
     <scripttest/>
-    <assertPropSet />
+    <assertPropSet/>
   </target>
 
-
   <target name="testPropertyResource">
     <js>
       <propertyresource name="prop" />
     </js>
     <scripttest/>
-    <assertPropSet />
+    <assertPropSet/>
   </target>
 
   <target name="testMixedResources">
-    <js >
+    <js>
       <string refid="script.code" />
       <propertyresource name="prop" />
       <string >
@@ -95,5 +85,4 @@
     <scripttest/>
     <assertPropSet name="property2" />
   </target>
-
-</project>
+</project>
\ No newline at end of file