diff --git a/src/etc/testcases/taskdefs/copydir.xml b/src/etc/testcases/taskdefs/copydir.xml
index e8b38c99c..8a8abd362 100644
--- a/src/etc/testcases/taskdefs/copydir.xml
+++ b/src/etc/testcases/taskdefs/copydir.xml
@@ -18,6 +18,12 @@
+
+
+
+
+
+
@@ -36,9 +42,9 @@
-
+
+ dest="${output}/taskdefs.tmp"/>
@@ -46,8 +52,5 @@
dest="template.xml"/>
-
-
-
diff --git a/src/etc/testcases/taskdefs/copyfile.xml b/src/etc/testcases/taskdefs/copyfile.xml
index 9584295c3..0f8c9ab00 100644
--- a/src/etc/testcases/taskdefs/copyfile.xml
+++ b/src/etc/testcases/taskdefs/copyfile.xml
@@ -18,6 +18,12 @@
+
+
+
+
+
+
@@ -37,18 +43,14 @@
+ dest="${output}/copyfile.tmp"/>
-
-
-
+
-
-
-
diff --git a/src/etc/testcases/taskdefs/delete.xml b/src/etc/testcases/taskdefs/delete.xml
index ad0ddf059..d74c8babc 100644
--- a/src/etc/testcases/taskdefs/delete.xml
+++ b/src/etc/testcases/taskdefs/delete.xml
@@ -18,8 +18,11 @@
-
-
+
+
+
+
+
@@ -187,6 +190,5 @@
-
diff --git a/src/etc/testcases/taskdefs/echo.xml b/src/etc/testcases/taskdefs/echo.xml
deleted file mode 100644
index 5f2abd0b8..000000000
--- a/src/etc/testcases/taskdefs/echo.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- This
- is
- a
- multiline
- message
-
-
-
-
-
-
-
-
-
-
-
-
-
- Did not find @{expected} in @{actual}
-
-
-
-
-
- Simple text
-
-
-
-
-
-
- Simple text
- Appended
-
-
-
-
-
-
- Simple text
-
-
-
-
-
-
- ${char}
-
-
-
-
-
-
- ${char}
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/etc/testcases/taskdefs/jar.xml b/src/etc/testcases/taskdefs/jar.xml
index 8edcad8d2..ab3a7d80c 100644
--- a/src/etc/testcases/taskdefs/jar.xml
+++ b/src/etc/testcases/taskdefs/jar.xml
@@ -18,11 +18,17 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -181,15 +187,6 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/CopydirTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/CopydirTest.java
index eecac59a8..3bfbf527f 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/CopydirTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/CopydirTest.java
@@ -30,10 +30,7 @@ public class CopydirTest extends BuildFileTest {
public void setUp() {
configureProject("src/etc/testcases/taskdefs/copydir.xml");
- }
-
- public void tearDown() {
- executeTarget("cleanup");
+ executeTarget("setUp");
}
public void test1() {
@@ -54,7 +51,7 @@ public class CopydirTest extends BuildFileTest {
public void test5() {
executeTarget("test5");
- java.io.File f = new java.io.File(getProjectDir(), "../taskdefs.tmp");
+ java.io.File f = new java.io.File(getOutputDir(), "taskdefs.tmp");
if (!f.exists() || !f.isDirectory()) {
fail("Copy failed");
}
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/CopyfileTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/CopyfileTest.java
index e32c49826..20407bbae 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/CopyfileTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/CopyfileTest.java
@@ -34,10 +34,7 @@ public class CopyfileTest extends BuildFileTest {
public void setUp() {
configureProject("src/etc/testcases/taskdefs/copyfile.xml");
- }
-
- public void tearDown() {
- executeTarget("cleanup");
+ executeTarget("setUp");
}
public void test1() {
@@ -58,10 +55,8 @@ public class CopyfileTest extends BuildFileTest {
public void test5() {
executeTarget("test5");
- java.io.File f = new java.io.File(getProjectDir(), "copyfile.tmp");
- if (f.exists()) {
- f.delete();
- } else {
+ java.io.File f = new java.io.File(getOutputDir(), "copyfile.tmp");
+ if (!f.exists()) {
fail("Copy failed");
}
}
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/DeleteTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/DeleteTest.java
index 2ddc7982d..1a4a52983 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/DeleteTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/DeleteTest.java
@@ -32,10 +32,6 @@ public class DeleteTest extends BuildFileTest {
configureProject("src/etc/testcases/taskdefs/delete.xml");
}
- public void tearDown() {
- executeTarget("cleanup");
- }
-
public void test1() {
expectBuildException("test1", "required argument not specified");
}
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java
index 1fb1f5b62..10c1738f2 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java
@@ -48,6 +48,7 @@ public class JarTest extends BuildFileTest {
public void setUp() {
configureProject("src/etc/testcases/taskdefs/jar.xml");
+ executeTarget("setUp");
}
public void tearDown() {
@@ -63,8 +64,11 @@ public class JarTest extends BuildFileTest {
} catch (IOException e) {
}
}
+ try {
+ super.tearDown();
+ } catch (Exception exc) {
- executeTarget("cleanup");
+ }
}
public void test1() {
@@ -81,7 +85,7 @@ public class JarTest extends BuildFileTest {
public void test4() {
executeTarget("test4");
- File jarFile = new File(getProjectDir(), tempJar);
+ File jarFile = new File(getOutputDir(), tempJar);
assertTrue(jarFile.exists());
}
@@ -95,7 +99,7 @@ public class JarTest extends BuildFileTest {
private void testNoRecreate(String secondTarget) {
executeTarget("test4");
- File jarFile = new File(getProjectDir(), tempJar);
+ File jarFile = new File(getOutputDir(), tempJar);
long jarModifiedDate = jarFile.lastModified();
try {
Thread.sleep(2500);
@@ -132,10 +136,10 @@ public class JarTest extends BuildFileTest {
Thread.sleep(sleeptime);
} catch (InterruptedException e) {
} // end of try-catch
- File jarFile = new File(getProjectDir(), tempJar);
+ File jarFile = new File(getOutputDir(), tempJar);
long jarModifiedDate = jarFile.lastModified();
executeTarget(secondTarget);
- jarFile = new File(getProjectDir(), tempJar);
+ jarFile = new File(getOutputDir(), tempJar);
assertTrue("jar has been recreated in " + secondTarget,
jarModifiedDate < jarFile.lastModified());
}
@@ -144,10 +148,10 @@ public class JarTest extends BuildFileTest {
throws IOException, ManifestException {
executeTarget("testManifestStaysIntact");
- r1 = new FileReader(getProject()
- .resolveFile(tempDir + "manifest"));
- r2 = new FileReader(getProject()
- .resolveFile(tempDir + "META-INF/MANIFEST.MF"));
+ r1 = new FileReader(new File(getOutputDir(),
+ tempDir + "manifest"));
+ r2 = new FileReader(new File(getOutputDir(),
+ tempDir + "META-INF/MANIFEST.MF"));
Manifest mf1 = new Manifest(r1);
Manifest mf2 = new Manifest(r2);
assertEquals(mf1, mf2);
@@ -197,7 +201,7 @@ public class JarTest extends BuildFileTest {
public void testUpdateIfOnlyManifestHasChanged() {
executeTarget("testUpdateIfOnlyManifestHasChanged");
- File jarXml = getProject().resolveFile(tempDir + "jar.xml");
+ File jarXml = new File(getOutputDir(), tempDir + "jar.xml");
assertTrue(jarXml.exists());
}
@@ -206,7 +210,7 @@ public class JarTest extends BuildFileTest {
ZipFile archive = null;
try {
executeTarget("testIndexTests");
- archive = new ZipFile(getProject().resolveFile(tempJar));
+ archive = new ZipFile(new File(getOutputDir(), tempJar));
Enumeration e = archive.entries();
int numberOfIndexLists = 0;
while (e.hasMoreElements()) {
@@ -228,7 +232,7 @@ public class JarTest extends BuildFileTest {
ZipFile archive = null;
try {
executeTarget("testIndexTests");
- archive = new ZipFile(getProject().resolveFile(tempJar));
+ archive = new ZipFile(new File(getOutputDir(), tempJar));
ZipEntry ze = archive.getEntry("META-INF/INDEX.LIST");
InputStream is = archive.getInputStream(ze);
BufferedReader r = new BufferedReader(new InputStreamReader(is,
@@ -260,7 +264,7 @@ public class JarTest extends BuildFileTest {
}
public void testManifestOnlyJar() {
expectLogContaining("testManifestOnlyJar", "Building MANIFEST-only jar: ");
- File manifestFile = getProject().resolveFile(tempDir + "META-INF" + File.separator + "MANIFEST.MF");
+ File manifestFile = new File(getOutputDir(), tempDir + "META-INF" + File.separator + "MANIFEST.MF");
assertTrue(manifestFile.exists());
}
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/ProtectedJarMethodsTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/ProtectedJarMethodsTest.java
index 699e86a52..d8bd4befb 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/ProtectedJarMethodsTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/ProtectedJarMethodsTest.java
@@ -35,15 +35,12 @@ public class ProtectedJarMethodsTest extends BuildFileTest {
public void setUp() {
configureProject("src/etc/testcases/taskdefs/jar.xml");
- }
-
- public void tearDown() {
- executeTarget("cleanup");
+ executeTarget("setUp");
}
public void testGrabFilesAndDirs() throws IOException {
executeTarget("testIndexTests");
- String archive = getProject().resolveFile(tempJar).getAbsolutePath();
+ String archive = getProject().getProperty(tempJar);
ArrayList dirs = new ArrayList();
ArrayList files = new ArrayList();
String[] expectedDirs = new String[] {