Browse Source

-use antunit-base

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@536740 13f79535-47bb-0310-9956-ffa450edef68
master
Kevin Jackson 18 years ago
parent
commit
c9ae2fb990
5 changed files with 13 additions and 38 deletions
  1. +2
    -8
      src/tests/antunit/taskdefs/delete-test.xml
  2. +3
    -7
      src/tests/antunit/taskdefs/javac-test.xml
  3. +2
    -7
      src/tests/antunit/taskdefs/pathconvert-test.xml
  4. +2
    -8
      src/tests/antunit/taskdefs/war-test.xml
  5. +4
    -8
      src/tests/antunit/taskdefs/whichresource-test.xml

+ 2
- 8
src/tests/antunit/taskdefs/delete-test.xml View File

@@ -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}"/>


+ 3
- 7
src/tests/antunit/taskdefs/javac-test.xml View File

@@ -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>

+ 2
- 7
src/tests/antunit/taskdefs/pathconvert-test.xml View File

@@ -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>

+ 2
- 8
src/tests/antunit/taskdefs/war-test.xml View File

@@ -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}"/>


+ 4
- 8
src/tests/antunit/taskdefs/whichresource-test.xml View File

@@ -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>

Loading…
Cancel
Save