From c9ae2fb9908703266c92b966a373d6020eb3885a Mon Sep 17 00:00:00 2001
From: Kevin Jackson <kevj@apache.org>
Date: Thu, 10 May 2007 04:42:26 +0000
Subject: [PATCH] -use antunit-base

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@536740 13f79535-47bb-0310-9956-ffa450edef68
---
 src/tests/antunit/taskdefs/delete-test.xml        | 10 ++--------
 src/tests/antunit/taskdefs/javac-test.xml         | 10 +++-------
 src/tests/antunit/taskdefs/pathconvert-test.xml   |  9 ++-------
 src/tests/antunit/taskdefs/war-test.xml           | 10 ++--------
 src/tests/antunit/taskdefs/whichresource-test.xml | 12 ++++--------
 5 files changed, 13 insertions(+), 38 deletions(-)

diff --git a/src/tests/antunit/taskdefs/delete-test.xml b/src/tests/antunit/taskdefs/delete-test.xml
index 10f1b6f3a..ff81b089d 100644
--- a/src/tests/antunit/taskdefs/delete-test.xml
+++ b/src/tests/antunit/taskdefs/delete-test.xml
@@ -1,18 +1,12 @@
 <?xml version="1.0"?>
 
-<project name="delete-test" basedir="." default="all"
+<project name="delete-test" basedir="." default="antunit"
        xmlns:au="antlib:org.apache.ant.antunit">
   <property name="working.dir" value="working"/>
   <property name="existing.dir" value="working/exists"/>
   <property name="nonexistent.dir" value="working/nonexists"/>
 	
-  <target name="all">
-    <au:antunit>
-      <fileset file="${ant.file}"/>
-      <au:plainlistener/>
-    </au:antunit>
-  </target>
-
+  <import file="../antunit-base.xml" />
 
   <target name="init">
     <delete dir="${working.dir}"/>
diff --git a/src/tests/antunit/taskdefs/javac-test.xml b/src/tests/antunit/taskdefs/javac-test.xml
index 44eebada4..656580445 100644
--- a/src/tests/antunit/taskdefs/javac-test.xml
+++ b/src/tests/antunit/taskdefs/javac-test.xml
@@ -1,4 +1,6 @@
-<project default="all" xmlns:au="antlib:org.apache.ant.antunit">
+<project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
+  <import file="../antunit-base.xml" />
+
   <property name="ant-build" location="../../../../build"/>
   <property name="build-dir" location="${ant-build}/ant-unit/javac-dir/build"/>
   
@@ -33,10 +35,4 @@
       <equals arg1="${compile-failed}" arg2="true"/>
     </au:assertTrue>
   </target>
-  <target name="all">
-    <au:antunit>
-      <fileset file="${ant.file}"/>
-      <au:plainlistener/>
-    </au:antunit>
-  </target>
 </project>
diff --git a/src/tests/antunit/taskdefs/pathconvert-test.xml b/src/tests/antunit/taskdefs/pathconvert-test.xml
index b5c43743e..d65330dac 100644
--- a/src/tests/antunit/taskdefs/pathconvert-test.xml
+++ b/src/tests/antunit/taskdefs/pathconvert-test.xml
@@ -1,4 +1,5 @@
-<project default="all" xmlns:au="antlib:org.apache.ant.antunit">
+<project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
+  <import file="../antunit-base.xml" />
 
   <target name="test-dir-char">
     <pathconvert property="def|ghi" dirsep="|">
@@ -10,10 +11,4 @@
     </au:assertTrue>
   </target>
 
-  <target name="all">
-    <au:antunit>
-      <fileset file="${ant.file}"/>
-      <au:plainlistener/>
-    </au:antunit>
-  </target>
 </project>
diff --git a/src/tests/antunit/taskdefs/war-test.xml b/src/tests/antunit/taskdefs/war-test.xml
index 0edac6e8b..8c0fb4722 100644
--- a/src/tests/antunit/taskdefs/war-test.xml
+++ b/src/tests/antunit/taskdefs/war-test.xml
@@ -1,16 +1,10 @@
 <?xml version="1.0"?>
 
-<project name="war-test" basedir="." default="all"
+<project name="war-test" basedir="." default="antunit"
        xmlns:au="antlib:org.apache.ant.antunit">
   <property name="working.dir" value="working"/>
 
-  <target name="all">
-    <au:antunit>
-      <fileset file="${ant.file}"/>
-      <au:plainlistener/>
-    </au:antunit>
-  </target>
-
+  <import file="../antunit-base.xml" />
 
   <target name="init">
     <delete dir="${working.dir}"/>
diff --git a/src/tests/antunit/taskdefs/whichresource-test.xml b/src/tests/antunit/taskdefs/whichresource-test.xml
index 3cbc16385..5d77bb087 100644
--- a/src/tests/antunit/taskdefs/whichresource-test.xml
+++ b/src/tests/antunit/taskdefs/whichresource-test.xml
@@ -1,4 +1,6 @@
-<project default="all" xmlns:au="antlib:org.apache.ant.antunit">
+<project default="antunit" xmlns:au="antlib:org.apache.ant.antunit">
+  <import file="../antunit-base.xml" />
+
   <property name="ant-build" location="../../../../build"/>
   <property name="build-dir" 
             location="${ant-build}/ant-unit/whichresource/build"/>
@@ -32,11 +34,5 @@
       <isset property="whichresource.prop2"/>
     </au:assertFalse>
   </target>
-
-  <target name="all">
-    <au:antunit>
-      <fileset file="${ant.file}"/>
-      <au:plainlistener/>
-    </au:antunit>
-  </target>
+    
 </project>