From 8031d7c31bd993dc3735bba04dc863ba11922f8a Mon Sep 17 00:00:00 2001
From: Matthew Jason Benson <mbenson@apache.org>
Date: Thu, 15 Jan 2009 19:34:18 +0000
Subject: [PATCH] move resource comparators tests to antunit

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@734784 13f79535-47bb-0310-9956-ffa450edef68
---
 .../types/resources/comparators/test.xml}     |  40 +++----
 .../ant/types/ResourceComparatorsTest.java    | 101 ------------------
 2 files changed, 20 insertions(+), 121 deletions(-)
 rename src/{etc/testcases/types/resources/comparators/build.xml => tests/antunit/types/resources/comparators/test.xml} (89%)
 delete mode 100755 src/tests/junit/org/apache/tools/ant/types/ResourceComparatorsTest.java

diff --git a/src/etc/testcases/types/resources/comparators/build.xml b/src/tests/antunit/types/resources/comparators/test.xml
similarity index 89%
rename from src/etc/testcases/types/resources/comparators/build.xml
rename to src/tests/antunit/types/resources/comparators/test.xml
index a3b20bc05..055c2499e 100755
--- a/src/etc/testcases/types/resources/comparators/build.xml
+++ b/src/tests/antunit/types/resources/comparators/test.xml
@@ -15,9 +15,11 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<project default="sort"
+<project default="antunit"
          xmlns:rcmp="antlib:org.apache.tools.ant.types.resources.comparators">
 
+  <import file="../../../antunit-base.xml" />
+
   <property name="dirname" value="work" />
   <property name="dir" location="${dirname}" />
   <property name="echolevel" value="debug" />
@@ -29,7 +31,7 @@
     <delete file="${file}" />
   </target>
 
-  <target name="sortsetup" unless="sortsetup.done">
+  <target name="setUp">
     <mkdir dir="${dir}" />
 
     <echo file="${dir}/b" message="yyy" />
@@ -60,11 +62,9 @@
         <echo level="${echolevel}">@{property}=${@{property}}</echo>
       </sequential>
     </macrodef>
-
-    <property name="sortsetup.done" value="true" />
   </target>
 
-  <target name="testsortdefault" depends="sortsetup">
+  <target name="testsortdefault" depends="setUp">
     <mysort property="sortdf" />
     <fail>
       <condition>
@@ -75,7 +75,7 @@
     </fail>
   </target>
 
-  <target name="testrvdefault" depends="sortsetup">
+  <target name="testrvdefault" depends="setUp">
     <mysort property="sortdf-rev">
       <rcmp:reverse />
     </mysort>
@@ -88,7 +88,7 @@
     </fail>
   </target>
 
-  <target name="testname" depends="sortsetup">
+  <target name="testname" depends="setUp">
     <mysort property="sortnm">
       <rcmp:name />
     </mysort>
@@ -101,7 +101,7 @@
     </fail>
   </target>
 
-  <target name="testrvname" depends="sortsetup">
+  <target name="testrvname" depends="setUp">
     <mysort property="sortnm-rev">
       <rcmp:reverse>
         <rcmp:name />
@@ -116,7 +116,7 @@
     </fail>
   </target>
 
-  <target name="testdate" depends="sortsetup">
+  <target name="testdate" depends="setUp">
     <mysort property="sortlm">
       <rcmp:date />
     </mysort>
@@ -129,7 +129,7 @@
     </fail>
   </target>
 
-  <target name="testrvdate" depends="sortsetup">
+  <target name="testrvdate" depends="setUp">
     <mysort property="sortlm-rev">
       <rcmp:reverse>
         <rcmp:date />
@@ -144,7 +144,7 @@
     </fail>
   </target>
 
-  <target name="testsize" depends="sortsetup">
+  <target name="testsize" depends="setUp">
     <mysort property="sortsz">
       <rcmp:size />
     </mysort>
@@ -157,7 +157,7 @@
     </fail>
   </target>
 
-  <target name="testrvsize" depends="sortsetup">
+  <target name="testrvsize" depends="setUp">
     <mysort property="sortsz-rev">
       <rcmp:reverse>
         <rcmp:size />
@@ -172,7 +172,7 @@
     </fail>
   </target>
 
-  <target name="testcontent" depends="sortsetup">
+  <target name="testcontent" depends="setUp">
     <mysort property="sortct">
       <rcmp:content />
     </mysort>
@@ -185,7 +185,7 @@
     </fail>
   </target>
 
-  <target name="testrvcontent" depends="sortsetup">
+  <target name="testrvcontent" depends="setUp">
     <mysort property="sortct-rev">
       <rcmp:reverse>
         <rcmp:content />
@@ -200,7 +200,7 @@
     </fail>
   </target>
 
-  <target name="testexists" depends="sortsetup">
+  <target name="testexists" depends="setUp">
     <pathconvert property="sortex" pathsep=",">
       <sort>
         <resources>
@@ -220,7 +220,7 @@
     </fail>
   </target>
 
-  <target name="testrvexists" depends="sortsetup">
+  <target name="testrvexists" depends="setUp">
     <pathconvert property="sortex-rev" pathsep=",">
       <sort>
         <resources>
@@ -242,7 +242,7 @@
     </fail>
   </target>
 
-  <target name="testtype" depends="sortsetup">
+  <target name="testtype" depends="setUp">
     <pathconvert property="sorttp" pathsep=",">
       <sort>
         <resources>
@@ -262,7 +262,7 @@
     </fail>
   </target>
 
-  <target name="testrvtype" depends="sortsetup">
+  <target name="testrvtype" depends="setUp">
     <pathconvert property="sorttp-rev" pathsep=",">
       <sort>
         <resources>
@@ -290,7 +290,7 @@
   <target name="reversesort"
     depends="testrvdefault,testrvname,testrvdate,testrvsize,testrvcontent,testrvexists,testrvtype" />
 
-  <target name="testcompoundsort1" depends="sortsetup">
+  <target name="testcompoundsort1" depends="setUp">
     <pathconvert property="sortcmp1" pathsep=",">
       <sort>
         <resources>
@@ -317,7 +317,7 @@
     </fail>
   </target>
 
-  <target name="testcompoundsort2" depends="sortsetup">
+  <target name="testcompoundsort2" depends="setUp">
     <pathconvert property="sortcmp2" pathsep=",">
       <sort>
         <files includes="${dir}/?" />
diff --git a/src/tests/junit/org/apache/tools/ant/types/ResourceComparatorsTest.java b/src/tests/junit/org/apache/tools/ant/types/ResourceComparatorsTest.java
deleted file mode 100755
index 0b39a60e5..000000000
--- a/src/tests/junit/org/apache/tools/ant/types/ResourceComparatorsTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *
- */
-
-package org.apache.tools.ant.types;
-
-import org.apache.tools.ant.BuildFileTest;
-
-public class ResourceComparatorsTest extends BuildFileTest {
-
-    public ResourceComparatorsTest(String name) {
-        super(name);
-    }
-
-    public void setUp() {
-        configureProject("src/etc/testcases/types/resources/comparators/build.xml");
-    }
-
-    public void tearDown() {
-        executeTarget("tearDown");
-    }
-
-    public void testcompoundsort1() {
-        executeTarget("testcompoundsort1");
-    }
-
-    public void testcompoundsort2() {
-        executeTarget("testcompoundsort2");
-    }
-
-    public void testcontent() {
-        executeTarget("testcontent");
-    }
-
-    public void testexists() {
-        executeTarget("testexists");
-    }
-
-    public void testdate() {
-        executeTarget("testdate");
-    }
-
-    public void testname() {
-        executeTarget("testname");
-    }
-
-    public void testrvcontent() {
-        executeTarget("testrvcontent");
-    }
-
-    public void testrvdefault() {
-        executeTarget("testrvdefault");
-    }
-
-    public void testrvexists() {
-        executeTarget("testrvexists");
-    }
-
-    public void testrvdate() {
-        executeTarget("testrvdate");
-    }
-
-    public void testrvname() {
-        executeTarget("testrvname");
-    }
-
-    public void testrvsize() {
-        executeTarget("testrvsize");
-    }
-
-    public void testrvtype() {
-        executeTarget("testrvtype");
-    }
-
-    public void testsize() {
-        executeTarget("testsize");
-    }
-
-    public void testsortdefault() {
-        executeTarget("testsortdefault");
-    }
-
-    public void testtype() {
-        executeTarget("testtype");
-    }
-
-}