Browse Source

REALLY antunit-ize the test

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@734788 13f79535-47bb-0310-9956-ffa450edef68
master
Matthew Jason Benson 16 years ago
parent
commit
19b0436737
1 changed files with 49 additions and 112 deletions
  1. +49
    -112
      src/tests/antunit/types/resources/comparators/test.xml

+ 49
- 112
src/tests/antunit/types/resources/comparators/test.xml View File

@@ -16,6 +16,7 @@
limitations under the License. limitations under the License.
--> -->
<project default="antunit" <project default="antunit"
xmlns:au="antlib:org.apache.ant.antunit"
xmlns:rcmp="antlib:org.apache.tools.ant.types.resources.comparators"> xmlns:rcmp="antlib:org.apache.tools.ant.types.resources.comparators">


<import file="../../../antunit-base.xml" /> <import file="../../../antunit-base.xml" />
@@ -66,39 +67,27 @@


<target name="testsortdefault" depends="setUp"> <target name="testsortdefault" depends="setUp">
<mysort property="sortdf" /> <mysort property="sortdf" />
<fail>
<condition>
<not>
<equals arg1="${sortdf}" arg2="a,b,c" />
</not>
</condition>
</fail>
<au:assertTrue>
<equals arg1="${sortdf}" arg2="a,b,c" />
</au:assertTrue>
</target> </target>


<target name="testrvdefault" depends="setUp"> <target name="testrvdefault" depends="setUp">
<mysort property="sortdf-rev"> <mysort property="sortdf-rev">
<rcmp:reverse /> <rcmp:reverse />
</mysort> </mysort>
<fail>
<condition>
<not>
<equals arg1="${sortdf-rev}" arg2="c,b,a" />
</not>
</condition>
</fail>
<au:assertTrue>
<equals arg1="${sortdf-rev}" arg2="c,b,a" />
</au:assertTrue>
</target> </target>


<target name="testname" depends="setUp"> <target name="testname" depends="setUp">
<mysort property="sortnm"> <mysort property="sortnm">
<rcmp:name /> <rcmp:name />
</mysort> </mysort>
<fail>
<condition>
<not>
<equals arg1="${sortnm}" arg2="a,b,c" />
</not>
</condition>
</fail>
<au:assertTrue>
<equals arg1="${sortnm}" arg2="a,b,c" />
</au:assertTrue>
</target> </target>


<target name="testrvname" depends="setUp"> <target name="testrvname" depends="setUp">
@@ -107,26 +96,18 @@
<rcmp:name /> <rcmp:name />
</rcmp:reverse> </rcmp:reverse>
</mysort> </mysort>
<fail>
<condition>
<not>
<equals arg1="${sortnm-rev}" arg2="c,b,a" />
</not>
</condition>
</fail>
<au:assertTrue>
<equals arg1="${sortnm-rev}" arg2="c,b,a" />
</au:assertTrue>
</target> </target>


<target name="testdate" depends="setUp"> <target name="testdate" depends="setUp">
<mysort property="sortlm"> <mysort property="sortlm">
<rcmp:date /> <rcmp:date />
</mysort> </mysort>
<fail>
<condition>
<not>
<equals arg1="${sortlm}" arg2="b,c,a" />
</not>
</condition>
</fail>
<au:assertTrue>
<equals arg1="${sortlm}" arg2="b,c,a" />
</au:assertTrue>
</target> </target>


<target name="testrvdate" depends="setUp"> <target name="testrvdate" depends="setUp">
@@ -135,26 +116,18 @@
<rcmp:date /> <rcmp:date />
</rcmp:reverse> </rcmp:reverse>
</mysort> </mysort>
<fail>
<condition>
<not>
<equals arg1="${sortlm-rev}" arg2="a,c,b" />
</not>
</condition>
</fail>
<au:assertTrue>
<equals arg1="${sortlm-rev}" arg2="a,c,b" />
</au:assertTrue>
</target> </target>


<target name="testsize" depends="setUp"> <target name="testsize" depends="setUp">
<mysort property="sortsz"> <mysort property="sortsz">
<rcmp:size /> <rcmp:size />
</mysort> </mysort>
<fail>
<condition>
<not>
<equals arg1="${sortsz}" arg2="c,a,b" />
</not>
</condition>
</fail>
<au:assertTrue>
<equals arg1="${sortsz}" arg2="c,a,b" />
</au:assertTrue>
</target> </target>


<target name="testrvsize" depends="setUp"> <target name="testrvsize" depends="setUp">
@@ -163,26 +136,18 @@
<rcmp:size /> <rcmp:size />
</rcmp:reverse> </rcmp:reverse>
</mysort> </mysort>
<fail>
<condition>
<not>
<equals arg1="${sortsz-rev}" arg2="b,a,c" />
</not>
</condition>
</fail>
<au:assertTrue>
<equals arg1="${sortsz-rev}" arg2="b,a,c" />
</au:assertTrue>
</target> </target>


<target name="testcontent" depends="setUp"> <target name="testcontent" depends="setUp">
<mysort property="sortct"> <mysort property="sortct">
<rcmp:content /> <rcmp:content />
</mysort> </mysort>
<fail>
<condition>
<not>
<equals arg1="${sortct}" arg2="c,b,a" />
</not>
</condition>
</fail>
<au:assertTrue>
<equals arg1="${sortct}" arg2="c,b,a" />
</au:assertTrue>
</target> </target>


<target name="testrvcontent" depends="setUp"> <target name="testrvcontent" depends="setUp">
@@ -191,13 +156,9 @@
<rcmp:content /> <rcmp:content />
</rcmp:reverse> </rcmp:reverse>
</mysort> </mysort>
<fail>
<condition>
<not>
<equals arg1="${sortct-rev}" arg2="a,b,c" />
</not>
</condition>
</fail>
<au:assertTrue>
<equals arg1="${sortct-rev}" arg2="a,b,c" />
</au:assertTrue>
</target> </target>


<target name="testexists" depends="setUp"> <target name="testexists" depends="setUp">
@@ -211,13 +172,9 @@
</sort> </sort>
<flattenmapper /> <flattenmapper />
</pathconvert> </pathconvert>
<fail>
<condition>
<not>
<equals arg1="${sortex}" arg2="redherring,a" />
</not>
</condition>
</fail>
<au:assertTrue>
<equals arg1="${sortex}" arg2="redherring,a" />
</au:assertTrue>
</target> </target>


<target name="testrvexists" depends="setUp"> <target name="testrvexists" depends="setUp">
@@ -233,13 +190,9 @@
</sort> </sort>
<flattenmapper /> <flattenmapper />
</pathconvert> </pathconvert>
<fail>
<condition>
<not>
<equals arg1="${sortex-rev}" arg2="a,redherring" />
</not>
</condition>
</fail>
<au:assertTrue>
<equals arg1="${sortex-rev}" arg2="a,redherring" />
</au:assertTrue>
</target> </target>


<target name="testtype" depends="setUp"> <target name="testtype" depends="setUp">
@@ -253,13 +206,9 @@
</sort> </sort>
<flattenmapper /> <flattenmapper />
</pathconvert> </pathconvert>
<fail>
<condition>
<not>
<equals arg1="${sorttp}" arg2="a,a.dir" />
</not>
</condition>
</fail>
<au:assertTrue>
<equals arg1="${sorttp}" arg2="a,a.dir" />
</au:assertTrue>
</target> </target>


<target name="testrvtype" depends="setUp"> <target name="testrvtype" depends="setUp">
@@ -275,13 +224,9 @@
</sort> </sort>
<flattenmapper /> <flattenmapper />
</pathconvert> </pathconvert>
<fail>
<condition>
<not>
<equals arg1="${sorttp-rev}" arg2="a.dir,a" />
</not>
</condition>
</fail>
<au:assertTrue>
<equals arg1="${sorttp-rev}" arg2="a.dir,a" />
</au:assertTrue>
</target> </target>


<target name="forwardsort" <target name="forwardsort"
@@ -308,13 +253,9 @@
</sort> </sort>
<flattenmapper /> <flattenmapper />
</pathconvert> </pathconvert>
<fail>
<condition>
<not>
<equals arg1="${sortcmp1}" arg2="a.dir,b.dir,c.dir,a,b,c" />
</not>
</condition>
</fail>
<au:assertTrue>
<equals arg1="${sortcmp1}" arg2="a.dir,b.dir,c.dir,a,b,c" />
</au:assertTrue>
</target> </target>


<target name="testcompoundsort2" depends="setUp"> <target name="testcompoundsort2" depends="setUp">
@@ -329,13 +270,9 @@
</sort> </sort>
<flattenmapper /> <flattenmapper />
</pathconvert> </pathconvert>
<fail>
<condition>
<not>
<equals arg1="${sortcmp2}" arg2="d,c,f,a,e,b" />
</not>
</condition>
</fail>
<au:assertTrue>
<equals arg1="${sortcmp2}" arg2="d,c,f,a,e,b" />
</au:assertTrue>
</target> </target>


<target name="compoundsort" depends="testcompoundsort1,testcompoundsort2" /> <target name="compoundsort" depends="testcompoundsort1,testcompoundsort2" />


Loading…
Cancel
Save