From cf8960e85c4c232d241b94d2fe2e4e581643a48c Mon Sep 17 00:00:00 2001
From: Peter Donald <donaldp@apache.org>
Date: Sun, 17 Mar 2002 08:07:52 +0000
Subject: [PATCH] Removed old hierarchy for test data

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@271871 13f79535-47bb-0310-9956-ffa450edef68
---
 .../testcases/org/apache/antlib/core/if.ant   | 63 ------------------
 .../org/apache/antlib/core/property.ant       | 65 -------------------
 .../org/apache/antlib/vfile/copy.ant          |  8 ---
 .../org/apache/antlib/vfile/src/emptyFile.txt |  0
 .../org/apache/antlib/vfile/src/file1.txt     |  1 -
 .../antlib/vfile/src/subdir1/someFile.html    |  5 --
 .../org/apache/aut/vfs/basedir/dir1/file1.txt |  0
 .../org/apache/aut/vfs/basedir/dir1/file2.txt |  0
 .../org/apache/aut/vfs/basedir/dir1/file3.txt |  0
 .../org/apache/aut/vfs/basedir/empty.txt      |  0
 .../org/apache/aut/vfs/basedir/file1.txt      |  2 -
 .../components/builder/bad-project-name.ant   |  4 --
 .../components/builder/bad-target-name.ant    |  5 --
 .../components/builder/bad-version.ant        |  3 -
 .../myrmidon/components/builder/bad-xml.ant   |  1 -
 .../myrmidon/components/builder/defaults.ant  |  3 -
 .../components/builder/mismatched-version.ant |  3 -
 .../components/builder/no-version.ant         |  3 -
 .../components/builder/set-base-dir.ant       |  3 -
 .../components/builder/set-default-target.ant |  3 -
 .../components/builder/set-project-name.ant   |  3 -
 .../components/deployer/ant-descriptor.xml    | 18 -----
 .../components/deployer/ant-roles.xml         |  4 --
 .../components/embeddor/project-builder.ant   |  6 --
 24 files changed, 203 deletions(-)
 delete mode 100644 proposal/myrmidon/etc/testcases/org/apache/antlib/core/if.ant
 delete mode 100644 proposal/myrmidon/etc/testcases/org/apache/antlib/core/property.ant
 delete mode 100644 proposal/myrmidon/etc/testcases/org/apache/antlib/vfile/copy.ant
 delete mode 100644 proposal/myrmidon/etc/testcases/org/apache/antlib/vfile/src/emptyFile.txt
 delete mode 100644 proposal/myrmidon/etc/testcases/org/apache/antlib/vfile/src/file1.txt
 delete mode 100644 proposal/myrmidon/etc/testcases/org/apache/antlib/vfile/src/subdir1/someFile.html
 delete mode 100644 proposal/myrmidon/etc/testcases/org/apache/aut/vfs/basedir/dir1/file1.txt
 delete mode 100644 proposal/myrmidon/etc/testcases/org/apache/aut/vfs/basedir/dir1/file2.txt
 delete mode 100644 proposal/myrmidon/etc/testcases/org/apache/aut/vfs/basedir/dir1/file3.txt
 delete mode 100644 proposal/myrmidon/etc/testcases/org/apache/aut/vfs/basedir/empty.txt
 delete mode 100644 proposal/myrmidon/etc/testcases/org/apache/aut/vfs/basedir/file1.txt
 delete mode 100644 proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/bad-project-name.ant
 delete mode 100644 proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/bad-target-name.ant
 delete mode 100644 proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/bad-version.ant
 delete mode 100644 proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/bad-xml.ant
 delete mode 100644 proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/defaults.ant
 delete mode 100644 proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/mismatched-version.ant
 delete mode 100644 proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/no-version.ant
 delete mode 100644 proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/set-base-dir.ant
 delete mode 100644 proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/set-default-target.ant
 delete mode 100644 proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/set-project-name.ant
 delete mode 100644 proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/deployer/ant-descriptor.xml
 delete mode 100644 proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/deployer/ant-roles.xml
 delete mode 100644 proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/embeddor/project-builder.ant

diff --git a/proposal/myrmidon/etc/testcases/org/apache/antlib/core/if.ant b/proposal/myrmidon/etc/testcases/org/apache/antlib/core/if.ant
deleted file mode 100644
index b3caca2af..000000000
--- a/proposal/myrmidon/etc/testcases/org/apache/antlib/core/if.ant
+++ /dev/null
@@ -1,63 +0,0 @@
-<project version="2.0">
-    <target name="true-prop">
-        <property name="test-prop" value="true"/>
-        <if test="test-prop">
-            <log>test-prop is set</log>
-        </if>
-        <if not-test="test-prop">
-            <log>test-prop is not set</log>
-        </if>
-    </target>
-
-    <target name="set-prop">
-        <property name="test-prop" value="some value"/>
-        <if test="test-prop">
-            <log>test-prop is set</log>
-        </if>
-        <if not-test="test-prop">
-            <log>test-prop is not set</log>
-        </if>
-    </target>
-
-    <target name="not-set-prop">
-        <if test="test-prop">
-            <log>test-prop is set</log>
-        </if>
-        <if not-test="test-prop">
-            <log>test-prop is not set</log>
-        </if>
-    </target>
-
-    <target name="false-prop">
-        <property name="test-prop" value="false"/>
-        <if test="test-prop">
-            <log>test-prop is set</log>
-        </if>
-        <if not-test="test-prop">
-            <log>test-prop is not set</log>
-        </if>
-    </target>
-
-    <target name="multiple-nested-tasks">
-        <property name="test-prop" value="true"/>
-        <if test="test-prop">
-            <log>task 1</log>
-            <log>task 2</log>
-            <log>task 3</log>
-            <log>task 4</log>
-        </if>
-    </target>
-
-    <target name="no-condition">
-        <if>
-            <log>no go</log>
-        </if>
-    </target>
-
-    <target name="too-many-conditions">
-        <if test="test-prop" not-test="test-prop">
-            <log>no go</log>
-        </if>
-    </target>
-
-</project>
\ No newline at end of file
diff --git a/proposal/myrmidon/etc/testcases/org/apache/antlib/core/property.ant b/proposal/myrmidon/etc/testcases/org/apache/antlib/core/property.ant
deleted file mode 100644
index 03cad74a0..000000000
--- a/proposal/myrmidon/etc/testcases/org/apache/antlib/core/property.ant
+++ /dev/null
@@ -1,65 +0,0 @@
-<project version="2.0">
-
-    <!-- Test setting property via attribute -->
-    <target name="set-attr">
-        <property name="test-prop" value="some value"/>
-        <log>test-prop = [${test-prop}]</log>
-    </target>
-
-    <!-- Test setting property via content -->
-    <target name="set-content">
-        <property name="test-prop2">some value</property>
-        <log>test-prop2 = [${test-prop2}]</log>
-    </target>
-
-    <!-- Test setting property via a nested element -->
-    <target name="set-element">
-        <property name="test-prop3">
-            <property-test-type value="some value"/>
-        </property>
-        <log>test-prop3 = [${test-prop3}]</log>
-    </target>
-
-    <!-- Test missing property name -->
-    <target name="missing-name">
-        <property value="some value"/>
-    </target>
-
-    <!-- Test missing property value -->
-    <target name="missing-value">
-        <property name="some-prop"/>
-    </target>
-
-    <!-- Test setting the value more than once -->
-    <target name="too-many-values1">
-        <property name="some-prop" value="some value">another value</property>
-    </target>
-
-    <!-- Test setting the value more than once -->
-    <target name="too-many-values2">
-        <property name="some-prop" value="some value">
-            <property-test-type value="value 2"/>
-        </property>
-    </target>
-
-    <!-- Test setting the value more than once -->
-    <target name="too-many-values3">
-        <property name="some-prop">
-            <property-test-type value="value 1"/>
-            <property-test-type value="value 2"/>
-            <property-test-type value="value 3"/>
-        </property>
-    </target>
-
-    <!-- Test properties with invalid names -->
-    <target name="bad-prop-name1">
-        <property name="badname!" value="value"/>
-    </target>
-    <target name="bad-prop-name2">
-        <property name="bad name" value="value"/>
-    </target>
-    <target name="bad-prop-name3">
-        <property name="" value="value"/>
-    </target>
-
-</project>
diff --git a/proposal/myrmidon/etc/testcases/org/apache/antlib/vfile/copy.ant b/proposal/myrmidon/etc/testcases/org/apache/antlib/vfile/copy.ant
deleted file mode 100644
index 18ea5067c..000000000
--- a/proposal/myrmidon/etc/testcases/org/apache/antlib/vfile/copy.ant
+++ /dev/null
@@ -1,8 +0,0 @@
-<project version="2.0">
-    <target name="copy">
-        <v-fileset id="src-files" dir="src"/>
-        <v-copy destdir="dest">
-            <v-fileset-ref id="src-files"/>
-        </v-copy>
-    </target>
-</project>
diff --git a/proposal/myrmidon/etc/testcases/org/apache/antlib/vfile/src/emptyFile.txt b/proposal/myrmidon/etc/testcases/org/apache/antlib/vfile/src/emptyFile.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/proposal/myrmidon/etc/testcases/org/apache/antlib/vfile/src/file1.txt b/proposal/myrmidon/etc/testcases/org/apache/antlib/vfile/src/file1.txt
deleted file mode 100644
index 9ad7b1b57..000000000
--- a/proposal/myrmidon/etc/testcases/org/apache/antlib/vfile/src/file1.txt
+++ /dev/null
@@ -1 +0,0 @@
-A test file.
\ No newline at end of file
diff --git a/proposal/myrmidon/etc/testcases/org/apache/antlib/vfile/src/subdir1/someFile.html b/proposal/myrmidon/etc/testcases/org/apache/antlib/vfile/src/subdir1/someFile.html
deleted file mode 100644
index c769030c0..000000000
--- a/proposal/myrmidon/etc/testcases/org/apache/antlib/vfile/src/subdir1/someFile.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<html>
-<body>
-<p>Yo!</p>
-</body>
-</html>
diff --git a/proposal/myrmidon/etc/testcases/org/apache/aut/vfs/basedir/dir1/file1.txt b/proposal/myrmidon/etc/testcases/org/apache/aut/vfs/basedir/dir1/file1.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/proposal/myrmidon/etc/testcases/org/apache/aut/vfs/basedir/dir1/file2.txt b/proposal/myrmidon/etc/testcases/org/apache/aut/vfs/basedir/dir1/file2.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/proposal/myrmidon/etc/testcases/org/apache/aut/vfs/basedir/dir1/file3.txt b/proposal/myrmidon/etc/testcases/org/apache/aut/vfs/basedir/dir1/file3.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/proposal/myrmidon/etc/testcases/org/apache/aut/vfs/basedir/empty.txt b/proposal/myrmidon/etc/testcases/org/apache/aut/vfs/basedir/empty.txt
deleted file mode 100644
index e69de29bb..000000000
diff --git a/proposal/myrmidon/etc/testcases/org/apache/aut/vfs/basedir/file1.txt b/proposal/myrmidon/etc/testcases/org/apache/aut/vfs/basedir/file1.txt
deleted file mode 100644
index e7dead2c1..000000000
--- a/proposal/myrmidon/etc/testcases/org/apache/aut/vfs/basedir/file1.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-This is a test file.
-With 2 lines in it.
diff --git a/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/bad-project-name.ant b/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/bad-project-name.ant
deleted file mode 100644
index 7b0ed6f75..000000000
--- a/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/bad-project-name.ant
+++ /dev/null
@@ -1,4 +0,0 @@
-<!-- Project with an invalid name -->
-<project version="2.0" name="!badname">
-    <target name="main"/>
-</project>
diff --git a/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/bad-target-name.ant b/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/bad-target-name.ant
deleted file mode 100644
index 8c7186956..000000000
--- a/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/bad-target-name.ant
+++ /dev/null
@@ -1,5 +0,0 @@
-<!-- Target with an invalid name -->
-<project version="2.0" name="ok name">
-    <target name="main"/>
-    <target name="bad ^ name"/>
-</project>
diff --git a/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/bad-version.ant b/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/bad-version.ant
deleted file mode 100644
index 922f14aee..000000000
--- a/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/bad-version.ant
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- Project with invalid version  -->
-<project version="ant2">
-</project>
\ No newline at end of file
diff --git a/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/bad-xml.ant b/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/bad-xml.ant
deleted file mode 100644
index 91717fd16..000000000
--- a/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/bad-xml.ant
+++ /dev/null
@@ -1 +0,0 @@
-this ain't xml.
diff --git a/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/defaults.ant b/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/defaults.ant
deleted file mode 100644
index b36a5c7ce..000000000
--- a/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/defaults.ant
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- Use all the defaults -->
-<project version="2.0">
-</project>
\ No newline at end of file
diff --git a/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/mismatched-version.ant b/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/mismatched-version.ant
deleted file mode 100644
index b9176c9c0..000000000
--- a/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/mismatched-version.ant
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- Project with mismatched version -->
-<project version="1.0.2">
-</project>
\ No newline at end of file
diff --git a/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/no-version.ant b/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/no-version.ant
deleted file mode 100644
index d1979fedf..000000000
--- a/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/no-version.ant
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- Project with no version attribute -->
-<project>
-</project>
\ No newline at end of file
diff --git a/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/set-base-dir.ant b/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/set-base-dir.ant
deleted file mode 100644
index 56fe72aa4..000000000
--- a/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/set-base-dir.ant
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- Project with a non-default base directory -->
-<project version="2.0" basedir="other-base-dir">
-</project>
\ No newline at end of file
diff --git a/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/set-default-target.ant b/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/set-default-target.ant
deleted file mode 100644
index f83f3bbeb..000000000
--- a/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/set-default-target.ant
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- Project with a non-default default target -->
-<project version="2.0" default="some-target">
-</project>
\ No newline at end of file
diff --git a/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/set-project-name.ant b/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/set-project-name.ant
deleted file mode 100644
index a8ae1a941..000000000
--- a/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/builder/set-project-name.ant
+++ /dev/null
@@ -1,3 +0,0 @@
-<!-- Project with non-default name -->
-<project name="some-project" version="2.0">
-</project >
\ No newline at end of file
diff --git a/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/deployer/ant-descriptor.xml b/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/deployer/ant-descriptor.xml
deleted file mode 100644
index 1f21fc7c5..000000000
--- a/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/deployer/ant-descriptor.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<ant-lib version="1.0">
-
-    <types>
-        <!-- Register a data-type -->
-        <data-type name="test-type1"
-                   classname="org.apache.myrmidon.components.deployer.TestType1"/>
-
-        <!-- Register a custom role implementation -->
-        <test-role1 name="test-type1"
-                    classname="org.apache.myrmidon.components.deployer.TestType1"/>
-
-        <!-- Register a converter -->
-        <converter classname="org.apache.myrmidon.components.deployer.TestConverter1"
-                   source="java.lang.String"
-                   destination="org.apache.myrmidon.components.deployer.TestType1"/>
-    </types>
-
-</ant-lib>
diff --git a/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/deployer/ant-roles.xml b/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/deployer/ant-roles.xml
deleted file mode 100644
index 1178a3553..000000000
--- a/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/deployer/ant-roles.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<roles version="1.0">
-    <!-- A custom role -->
-    <role shorthand="test-role1" name="org.apache.myrmidon.components.deployer.TestRole1"/>
-</roles>
diff --git a/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/embeddor/project-builder.ant b/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/embeddor/project-builder.ant
deleted file mode 100644
index 7f52d2702..000000000
--- a/proposal/myrmidon/etc/testcases/org/apache/myrmidon/components/embeddor/project-builder.ant
+++ /dev/null
@@ -1,6 +0,0 @@
-<project version="2.0" name="test-project" default="main-target">
-    <property name="some-prop" value="some-value"/>
-    <target name="main-target">
-        <log>A log message</log>
-    </target>
-</project>
\ No newline at end of file