Return-Path: 
 <dev-return-79139-apmail-ant-dev-archive=ant.apache.org@ant.apache.org>
Delivered-To: apmail-ant-dev-archive@www.apache.org
Received: (qmail 29653 invoked from network); 12 May 2007 04:32:08 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 12 May 2007 04:32:08 -0000
Received: (qmail 74951 invoked by uid 500); 12 May 2007 04:32:13 -0000
Delivered-To: apmail-ant-dev-archive@ant.apache.org
Received: (qmail 74916 invoked by uid 500); 12 May 2007 04:32:13 -0000
Mailing-List: contact dev-help@ant.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:dev-unsubscribe@ant.apache.org>
List-Help: <mailto:dev-help@ant.apache.org>
List-Post: <mailto:dev@ant.apache.org>
List-Id: "Ant Developers List" <dev.ant.apache.org>
Reply-To: "Ant Developers List" <dev@ant.apache.org>
Delivered-To: mailing list dev@ant.apache.org
Received: (qmail 74905 invoked by uid 500); 12 May 2007 04:32:13 -0000
Received: (qmail 74902 invoked by uid 99); 12 May 2007 04:32:13 -0000
Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 May 2007 21:32:13 -0700
X-ASF-Spam-Status: No, hits=-99.5 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 11 May 2007 21:32:06 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 6C60F1A9838; Fri, 11 May 2007 21:31:46 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r537333 -
 /ant/core/trunk/src/tests/antunit/taskdefs/optional/script/scriptdef-test.xml
Date: Sat, 12 May 2007 04:31:44 -0000
To: ant-cvs@apache.org
From: kevj@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070512043146.6C60F1A9838@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: kevj
Date: Fri May 11 21:31:40 2007
New Revision: 537333

URL: http://svn.apache.org/viewvc?view=rev&rev=537333
Log:
-remove whitespace, use antunit-base.xml

Modified:
    ant/core/trunk/src/tests/antunit/taskdefs/optional/script/scriptdef-test.xml

Modified: ant/core/trunk/src/tests/antunit/taskdefs/optional/script/scriptdef-test.xml
URL: http://svn.apache.org/viewvc/ant/core/trunk/src/tests/antunit/taskdefs/optional/script/scriptdef-test.xml?view=diff&rev=537333&r1=537332&r2=537333
==============================================================================
--- ant/core/trunk/src/tests/antunit/taskdefs/optional/script/scriptdef-test.xml (original)
+++ ant/core/trunk/src/tests/antunit/taskdefs/optional/script/scriptdef-test.xml Fri May 11 21:31:40 2007
@@ -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



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org
For additional commands, e-mail: dev-help@ant.apache.org