From 3572b96ca9382bef2069a89931185ba26626f958 Mon Sep 17 00:00:00 2001
From: Conor MacNeill <conor@apache.org>
Date: Wed, 14 Nov 2001 12:25:31 +0000
Subject: [PATCH] Move all tests to BuildFileTest from TaskdefsTest

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@269911 13f79535-47bb-0310-9956-ffa450edef68
---
 src/testcases/org/apache/tools/ant/IncludeTest.java       | 4 ++--
 .../org/apache/tools/ant/taskdefs/AntStructureTest.java   | 3 ++-
 src/testcases/org/apache/tools/ant/taskdefs/AntTest.java  | 3 ++-
 .../org/apache/tools/ant/taskdefs/AvailableTest.java      | 3 ++-
 .../org/apache/tools/ant/taskdefs/CVSPassTest.java        | 3 ++-
 src/testcases/org/apache/tools/ant/taskdefs/CopyTest.java | 4 +++-
 .../org/apache/tools/ant/taskdefs/CopydirTest.java        | 3 ++-
 .../org/apache/tools/ant/taskdefs/CopyfileTest.java       | 3 ++-
 .../org/apache/tools/ant/taskdefs/DeleteTest.java         | 4 +++-
 .../org/apache/tools/ant/taskdefs/DeltreeTest.java        | 4 +++-
 .../org/apache/tools/ant/taskdefs/DependSetTest.java      | 4 +++-
 src/testcases/org/apache/tools/ant/taskdefs/EchoTest.java | 4 +++-
 src/testcases/org/apache/tools/ant/taskdefs/FailTest.java | 4 +++-
 .../org/apache/tools/ant/taskdefs/FilterTest.java         | 3 ++-
 .../org/apache/tools/ant/taskdefs/FixCrLfTest.java        | 3 ++-
 .../org/apache/tools/ant/taskdefs/GUnzipTest.java         | 8 ++++----
 src/testcases/org/apache/tools/ant/taskdefs/GetTest.java  | 3 ++-
 src/testcases/org/apache/tools/ant/taskdefs/GzipTest.java | 3 ++-
 src/testcases/org/apache/tools/ant/taskdefs/JarTest.java  | 3 ++-
 .../org/apache/tools/ant/taskdefs/MkdirTest.java          | 7 ++++---
 .../org/apache/tools/ant/taskdefs/PropertyTest.java       | 3 ++-
 .../org/apache/tools/ant/taskdefs/RenameTest.java         | 3 ++-
 .../org/apache/tools/ant/taskdefs/ReplaceTest.java        | 4 +++-
 .../org/apache/tools/ant/taskdefs/SleepTest.java          | 3 ++-
 src/testcases/org/apache/tools/ant/taskdefs/TarTest.java  | 3 ++-
 .../org/apache/tools/ant/taskdefs/TaskdefTest.java        | 3 ++-
 .../org/apache/tools/ant/taskdefs/TaskdefsTest.java       | 2 ++
 .../org/apache/tools/ant/taskdefs/TypedefTest.java        | 3 ++-
 .../org/apache/tools/ant/taskdefs/UnzipTest.java          | 3 ++-
 src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java  | 3 ++-
 .../org/apache/tools/ant/taskdefs/optional/ANTLRTest.java | 4 ++--
 .../tools/ant/taskdefs/optional/PropertyFileTest.java     | 4 ++--
 .../org/apache/tools/ant/taskdefs/optional/PvcsTest.java  | 4 ++--
 .../tools/ant/taskdefs/optional/ReplaceRegExpTest.java    | 4 ++--
 src/testcases/org/apache/tools/ant/types/MapperTest.java  | 4 ++--
 35 files changed, 81 insertions(+), 45 deletions(-)

diff --git a/src/testcases/org/apache/tools/ant/IncludeTest.java b/src/testcases/org/apache/tools/ant/IncludeTest.java
index 67dba02f3..6eccbdea2 100644
--- a/src/testcases/org/apache/tools/ant/IncludeTest.java
+++ b/src/testcases/org/apache/tools/ant/IncludeTest.java
@@ -54,14 +54,14 @@
 
 package org.apache.tools.ant;
 
-import org.apache.tools.ant.taskdefs.TaskdefsTest;
+import org.apache.tools.ant.BuildFileTest;
 
 /**
  * Test the build file inclusion using XML entities.
  *
  * @author Conor MacNeill
  */
-public class IncludeTest extends TaskdefsTest { 
+public class IncludeTest extends BuildFileTest { 
     
     public IncludeTest(String name) { 
         super(name);
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/AntStructureTest.java b/src/testcases/org/apache/tools/ant/taskdefs/AntStructureTest.java
index 0e5b8de78..d133dc96f 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/AntStructureTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/AntStructureTest.java
@@ -54,10 +54,11 @@
 
 package org.apache.tools.ant.taskdefs;
 
+import org.apache.tools.ant.BuildFileTest;
 /**
  * @author Nico Seessle <nico@seessle.de> 
  */
-public class AntStructureTest extends TaskdefsTest { 
+public class AntStructureTest extends BuildFileTest { 
     
     public AntStructureTest(String name) { 
         super(name);
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/AntTest.java b/src/testcases/org/apache/tools/ant/taskdefs/AntTest.java
index b8bbdbd13..49ff33bce 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/AntTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/AntTest.java
@@ -61,12 +61,13 @@ import junit.framework.AssertionFailedError;
 import org.apache.tools.ant.BuildEvent;
 import org.apache.tools.ant.BuildListener;
 
+import org.apache.tools.ant.BuildFileTest;
 /**
  * @author Nico Seessle <nico@seessle.de> 
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a> 
  * @version $Revision$
  */
-public class AntTest extends TaskdefsTest { 
+public class AntTest extends BuildFileTest { 
     
     public AntTest(String name) { 
         super(name);
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java b/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java
index 639964b42..bf0359df3 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java
@@ -54,10 +54,11 @@
 
 package org.apache.tools.ant.taskdefs;
 
+import org.apache.tools.ant.BuildFileTest;
 /**
  * @author Nico Seessle <nico@seessle.de> 
  */
-public class AvailableTest extends TaskdefsTest { 
+public class AvailableTest extends BuildFileTest { 
 
     public AvailableTest(String name) { 
         super(name);
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/CVSPassTest.java b/src/testcases/org/apache/tools/ant/taskdefs/CVSPassTest.java
index 08c5ccd4c..567d2c0db 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/CVSPassTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/CVSPassTest.java
@@ -56,13 +56,14 @@ package org.apache.tools.ant.taskdefs;
 
 import java.io.*;
 import org.apache.tools.ant.*;
+import org.apache.tools.ant.BuildFileTest;
 
 /**
  * Tests CVSLogin task.
  *
  * @author <a href="mailto:jeff@custommonkey.org">Jeff Martin</a>
  */
-public class CVSPassTest extends TaskdefsTest { 
+public class CVSPassTest extends BuildFileTest { 
     private final String EOL = System.getProperty("line.separator");
     private final String JAKARTA_URL =
         ":pserver:anoncvs@jakarta.apache.org:/home/cvspublic Ay=0=h<Z";
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/CopyTest.java b/src/testcases/org/apache/tools/ant/taskdefs/CopyTest.java
index 21c079310..2f8df2d64 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/CopyTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/CopyTest.java
@@ -54,12 +54,14 @@
 
 package org.apache.tools.ant.taskdefs;
 
+import org.apache.tools.ant.BuildFileTest;
+
 /**
  * Tests FileSet using the Copy task.
  *
  * @author David Rees <dave@ubiqsoft.com> 
  */
-public class CopyTest extends TaskdefsTest { 
+public class CopyTest extends BuildFileTest { 
     
     public CopyTest(String name) { 
         super(name);
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java b/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java
index be962e0ec..2ffd533f3 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java
@@ -55,11 +55,12 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
+import org.apache.tools.ant.BuildFileTest;
 
 /**
  * @author Nico Seessle <nico@seessle.de> 
  */
-public class CopydirTest extends TaskdefsTest { 
+public class CopydirTest extends BuildFileTest { 
     
     public CopydirTest(String name) { 
         super(name);
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java b/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java
index 2c20e2a92..71c5785c7 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java
@@ -55,11 +55,12 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
+import org.apache.tools.ant.BuildFileTest;
 
 /**
  * @author Nico Seessle <nico@seessle.de> 
  */
-public class CopyfileTest extends TaskdefsTest { 
+public class CopyfileTest extends BuildFileTest { 
     
     public void test6() { 
         expectBuildException("test6", "target is directory");
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/DeleteTest.java b/src/testcases/org/apache/tools/ant/taskdefs/DeleteTest.java
index 92d0aba13..bcad7371b 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/DeleteTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/DeleteTest.java
@@ -54,10 +54,12 @@
 
 package org.apache.tools.ant.taskdefs;
 
+import org.apache.tools.ant.BuildFileTest;
+
 /**
  * @author Nico Seessle <nico@seessle.de> 
  */
-public class DeleteTest extends TaskdefsTest { 
+public class DeleteTest extends BuildFileTest { 
     
     public DeleteTest(String name) { 
         super(name);
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/DeltreeTest.java b/src/testcases/org/apache/tools/ant/taskdefs/DeltreeTest.java
index c6bee1075..f1c77e501 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/DeltreeTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/DeltreeTest.java
@@ -54,10 +54,12 @@
 
 package org.apache.tools.ant.taskdefs;
 
+import org.apache.tools.ant.BuildFileTest;
+
 /**
  * @author Nico Seessle <nico@seessle.de> 
  */
-public class DeltreeTest extends TaskdefsTest { 
+public class DeltreeTest extends BuildFileTest { 
     
     public DeltreeTest(String name) { 
         super(name);
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/DependSetTest.java b/src/testcases/org/apache/tools/ant/taskdefs/DependSetTest.java
index 58e22c606..f77a1d57f 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/DependSetTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/DependSetTest.java
@@ -54,12 +54,14 @@
 
 package org.apache.tools.ant.taskdefs;
 
+import org.apache.tools.ant.BuildFileTest;
+
 /**
  * Tests DependSet.
  *
  * @author <a href="mailto:cstrong@arielpartners.com">Craeg Strong</a>
  */
-public class DependSetTest extends TaskdefsTest { 
+public class DependSetTest extends BuildFileTest { 
     
     public DependSetTest(String name) { 
         super(name);
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/EchoTest.java b/src/testcases/org/apache/tools/ant/taskdefs/EchoTest.java
index e32366819..a8b214d4e 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/EchoTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/EchoTest.java
@@ -54,10 +54,12 @@
 
 package org.apache.tools.ant.taskdefs;
 
+import org.apache.tools.ant.BuildFileTest;
+
 /**
  * @author Nico Seessle <nico@seessle.de> 
  */
-public class EchoTest extends TaskdefsTest { 
+public class EchoTest extends BuildFileTest { 
     
     public EchoTest(String name) { 
         super(name);
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/FailTest.java b/src/testcases/org/apache/tools/ant/taskdefs/FailTest.java
index c32d4fe82..63686cc65 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/FailTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/FailTest.java
@@ -54,10 +54,12 @@
 
 package org.apache.tools.ant.taskdefs;
 
+import org.apache.tools.ant.BuildFileTest;
+
 /**
  * @author Nico Seessle <nico@seessle.de> 
  */
-public class FailTest extends TaskdefsTest { 
+public class FailTest extends BuildFileTest { 
     
     public FailTest(String name) { 
         super(name);
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/FilterTest.java b/src/testcases/org/apache/tools/ant/taskdefs/FilterTest.java
index 516cbeab7..b64438370 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/FilterTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/FilterTest.java
@@ -59,11 +59,12 @@ import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
+import org.apache.tools.ant.BuildFileTest;
 
 /**
  * @author Nico Seessle <nico@seessle.de> 
  */
-public class FilterTest extends TaskdefsTest { 
+public class FilterTest extends BuildFileTest { 
       
     public FilterTest(String name) { 
         super(name);
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java b/src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java
index 0c17a4220..2d4d7f0da 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java
@@ -57,12 +57,13 @@ package org.apache.tools.ant.taskdefs;
 import java.io.*;
 
 import junit.framework.AssertionFailedError;
+import org.apache.tools.ant.BuildFileTest;
 
 /**
  * @author <a href="mailto:pbwest@powerup.com.au">Peter B. West</a>
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  */
-public class FixCrLfTest extends TaskdefsTest {
+public class FixCrLfTest extends BuildFileTest {
 
     public FixCrLfTest(String name) {
         super(name);
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/GUnzipTest.java b/src/testcases/org/apache/tools/ant/taskdefs/GUnzipTest.java
index 6d98a503e..715eeecd4 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/GUnzipTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/GUnzipTest.java
@@ -51,15 +51,15 @@
  * information on the Apache Software Foundation, please see
  * <http://www.apache.org/>.
  */
-
- package org.apache.tools.ant.taskdefs;
+package org.apache.tools.ant.taskdefs;
  
- import java.io.File;
+import java.io.File;
+import org.apache.tools.ant.BuildFileTest;
 
 /**
  * @author Nico Seessle <nico@seessle.de> 
  */
-public class GUnzipTest extends TaskdefsTest { 
+public class GUnzipTest extends BuildFileTest { 
     
     public GUnzipTest(String name) { 
         super(name);
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/GetTest.java b/src/testcases/org/apache/tools/ant/taskdefs/GetTest.java
index aed8efba4..6d315db52 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/GetTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/GetTest.java
@@ -55,11 +55,12 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
+import org.apache.tools.ant.BuildFileTest;
 
 /**
  * @author Nico Seessle <nico@seessle.de> 
  */
-public class GetTest extends TaskdefsTest { 
+public class GetTest extends BuildFileTest { 
     
     public GetTest(String name) { 
         super(name);
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/GzipTest.java b/src/testcases/org/apache/tools/ant/taskdefs/GzipTest.java
index b3710eea9..1c28cb570 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/GzipTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/GzipTest.java
@@ -55,11 +55,12 @@
 package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
+import org.apache.tools.ant.BuildFileTest;
  
 /**
  * @author Nico Seessle <nico@seessle.de> 
  */
-public class GzipTest extends TaskdefsTest { 
+public class GzipTest extends BuildFileTest { 
     
     public GzipTest(String name) { 
         super(name);
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java b/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
index 253e3f681..863d06841 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
@@ -56,11 +56,12 @@ package org.apache.tools.ant.taskdefs;
 
 import java.io.File;
 import java.util.Date;
+import org.apache.tools.ant.BuildFileTest;
 
 /**
  * @author Erik Meade <emeade@geekfarm.org>
  */
-public class JarTest extends TaskdefsTest {
+public class JarTest extends BuildFileTest {
 
     private static long jarModifiedDate;
     private static String tempJar = "tmp.jar";
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/MkdirTest.java b/src/testcases/org/apache/tools/ant/taskdefs/MkdirTest.java
index 7d85fa0b2..bb578d1ed 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/MkdirTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/MkdirTest.java
@@ -1,5 +1,3 @@
-package org.apache.tools.ant.taskdefs;
-
 /*
  * The Apache Software License, Version 1.1
  *
@@ -53,11 +51,14 @@ package org.apache.tools.ant.taskdefs;
  * information on the Apache Software Foundation, please see
  * <http://www.apache.org/>.
  */
+package org.apache.tools.ant.taskdefs;
+
+import org.apache.tools.ant.BuildFileTest;
 
 /**
  * @author Nico Seessle <nico@seessle.de> 
  */
-public class MkdirTest extends TaskdefsTest { 
+public class MkdirTest extends BuildFileTest { 
     
     public MkdirTest(String name) { 
         super(name);
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/PropertyTest.java b/src/testcases/org/apache/tools/ant/taskdefs/PropertyTest.java
index 1b2860334..04e6d1f8b 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/PropertyTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/PropertyTest.java
@@ -55,11 +55,12 @@
 package org.apache.tools.ant.taskdefs;
 
 import org.apache.tools.ant.*;
+import org.apache.tools.ant.BuildFileTest;
 
 /**
  * @author Conor MacNeill
  */
-public class PropertyTest extends TaskdefsTest { 
+public class PropertyTest extends BuildFileTest { 
     
     public PropertyTest(String name) { 
         super(name);
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/RenameTest.java b/src/testcases/org/apache/tools/ant/taskdefs/RenameTest.java
index e733bc74c..353536910 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/RenameTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/RenameTest.java
@@ -53,11 +53,12 @@
  */
 
 package org.apache.tools.ant.taskdefs;
+import org.apache.tools.ant.BuildFileTest;
 
 /**
  * @author Nico Seessle <nico@seessle.de> 
  */
-public class RenameTest extends TaskdefsTest { 
+public class RenameTest extends BuildFileTest { 
     
     public RenameTest(String name) { 
         super(name);
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ReplaceTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ReplaceTest.java
index 7588a09d5..f39e1a5e3 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/ReplaceTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/ReplaceTest.java
@@ -54,10 +54,12 @@
 
 package org.apache.tools.ant.taskdefs;
 
+import org.apache.tools.ant.BuildFileTest;
+
 /**
  * @author Nico Seessle <nico@seessle.de> 
  */
-public class ReplaceTest extends TaskdefsTest { 
+public class ReplaceTest extends BuildFileTest { 
     
     public ReplaceTest(String name) { 
         super(name);
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/SleepTest.java b/src/testcases/org/apache/tools/ant/taskdefs/SleepTest.java
index cd1679b02..f894debc2 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/SleepTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/SleepTest.java
@@ -54,11 +54,12 @@
 
 package org.apache.tools.ant.taskdefs;
 
+import org.apache.tools.ant.BuildFileTest;
 /**
  * @author steve_l@iseran.com steve loughran
  * @created 01 May 2001
  */
-public class SleepTest extends TaskdefsTest {
+public class SleepTest extends BuildFileTest {
 
 
     private final static String TASKDEFS_DIR = "src/etc/testcases/taskdefs/";
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/TarTest.java b/src/testcases/org/apache/tools/ant/taskdefs/TarTest.java
index 4f7a03282..6d1bc5744 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/TarTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/TarTest.java
@@ -53,11 +53,12 @@
  */
 
 package org.apache.tools.ant.taskdefs;
+import org.apache.tools.ant.BuildFileTest;
 
 /**
  * @author Nico Seessle <nico@seessle.de> 
  */
-public class TarTest extends TaskdefsTest { 
+public class TarTest extends BuildFileTest { 
     
     public TarTest(String name) { 
         super(name);
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/TaskdefTest.java b/src/testcases/org/apache/tools/ant/taskdefs/TaskdefTest.java
index f50bf706b..a8993c691 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/TaskdefTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/TaskdefTest.java
@@ -55,11 +55,12 @@
 package org.apache.tools.ant.taskdefs;
 
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.BuildFileTest;
 
 /**
  * @author Nico Seessle <nico@seessle.de> 
  */
-public class TaskdefTest extends TaskdefsTest { 
+public class TaskdefTest extends BuildFileTest { 
     
     public TaskdefTest(String name) { 
         super(name);
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/TaskdefsTest.java b/src/testcases/org/apache/tools/ant/taskdefs/TaskdefsTest.java
index 0b7ec54a4..39441ce24 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/TaskdefsTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/TaskdefsTest.java
@@ -60,6 +60,8 @@ import org.apache.tools.ant.BuildFileTest;
 
 /**
  * @author Nico Seessle <nico@seessle.de> 
+ *
+ * @deprecated use BuildFileTest instead.
  */
 public abstract class TaskdefsTest extends BuildFileTest { 
     
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/TypedefTest.java b/src/testcases/org/apache/tools/ant/taskdefs/TypedefTest.java
index d0a5dd85b..c750d35c1 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/TypedefTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/TypedefTest.java
@@ -55,12 +55,13 @@
 package org.apache.tools.ant.taskdefs;
 
 import org.apache.tools.ant.Project;
+import org.apache.tools.ant.BuildFileTest;
 
 /**
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
  * @version $Revision$
  */
-public class TypedefTest extends TaskdefsTest { 
+public class TypedefTest extends BuildFileTest { 
     
     public TypedefTest(String name) { 
         super(name);
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/UnzipTest.java b/src/testcases/org/apache/tools/ant/taskdefs/UnzipTest.java
index bc2f8fbba..50e8282c3 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/UnzipTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/UnzipTest.java
@@ -53,11 +53,12 @@
  */
 
 package org.apache.tools.ant.taskdefs;
+import org.apache.tools.ant.BuildFileTest;
 
 /**
  * @author Nico Seessle <nico@seessle.de> 
  */
-public class UnzipTest extends TaskdefsTest { 
+public class UnzipTest extends BuildFileTest { 
     
     public UnzipTest(String name) { 
         super(name);
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java b/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java
index ada7d1a15..9cd471c48 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java
@@ -53,11 +53,12 @@
  */
 
 package org.apache.tools.ant.taskdefs;
+import org.apache.tools.ant.BuildFileTest;
 
 /**
  * @author Nico Seessle <nico@seessle.de> 
  */
-public class ZipTest extends TaskdefsTest { 
+public class ZipTest extends BuildFileTest { 
     
     public ZipTest(String name) { 
         super(name);
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/ANTLRTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/ANTLRTest.java
index 47360a290..0c9e10572 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/optional/ANTLRTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/ANTLRTest.java
@@ -55,11 +55,11 @@
 package org.apache.tools.ant.taskdefs.optional;
 
 import java.io.*;
-import org.apache.tools.ant.taskdefs.TaskdefsTest;
+import org.apache.tools.ant.BuildFileTest;
 /**
  * @author Erik Meade <emeade@geekfarm.org>
  */
-public class ANTLRTest extends TaskdefsTest {
+public class ANTLRTest extends BuildFileTest {
 
     private final static String TASKDEFS_DIR = "src/etc/testcases/taskdefs/optional/antlr/";
 
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java
index 1f6970d09..07ef8891f 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java
@@ -53,7 +53,7 @@
  */
 package org.apache.tools.ant.taskdefs.optional;
 
-import org.apache.tools.ant.taskdefs.TaskdefsTest;
+import org.apache.tools.ant.BuildFileTest;
 
 import java.util.Properties;
 import java.io.FileOutputStream;
@@ -70,7 +70,7 @@ import java.io.File;
  *@created    October 2, 2001
  */
 
-public class PropertyFileTest extends TaskdefsTest {
+public class PropertyFileTest extends BuildFileTest {
 
     public PropertyFileTest(String name) {
         super(name);
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/PvcsTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/PvcsTest.java
index 68e32b793..f3728ee52 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/optional/PvcsTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/PvcsTest.java
@@ -55,12 +55,12 @@
 package org.apache.tools.ant.taskdefs.optional;
 
 import java.io.*;
-import org.apache.tools.ant.taskdefs.TaskdefsTest;
+import org.apache.tools.ant.BuildFileTest;
 
 /**
  * @author Thomas Christensen <tchristensen@nordija.com>
  */
-public class PvcsTest extends TaskdefsTest { 
+public class PvcsTest extends BuildFileTest { 
     
     public PvcsTest(String name) { 
         super(name);
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/ReplaceRegExpTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/ReplaceRegExpTest.java
index 260c86aa0..a46c5d272 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/optional/ReplaceRegExpTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/ReplaceRegExpTest.java
@@ -53,7 +53,7 @@
  */
 package org.apache.tools.ant.taskdefs.optional;
 
-import org.apache.tools.ant.taskdefs.TaskdefsTest;
+import org.apache.tools.ant.BuildFileTest;
 
 import java.util.Properties;
 import java.io.FileInputStream;
@@ -65,7 +65,7 @@ import java.io.IOException;
  * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a> 
  * @version $Revision$
  */
-public class ReplaceRegExpTest extends TaskdefsTest {
+public class ReplaceRegExpTest extends BuildFileTest {
 
     public ReplaceRegExpTest(String name) {
         super(name);
diff --git a/src/testcases/org/apache/tools/ant/types/MapperTest.java b/src/testcases/org/apache/tools/ant/types/MapperTest.java
index ec4f45b49..896bbe2b6 100644
--- a/src/testcases/org/apache/tools/ant/types/MapperTest.java
+++ b/src/testcases/org/apache/tools/ant/types/MapperTest.java
@@ -57,7 +57,7 @@ package org.apache.tools.ant.types;
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.util.*;
-import org.apache.tools.ant.taskdefs.TaskdefsTest;
+import org.apache.tools.ant.BuildFileTest;
 
 import junit.framework.TestCase;
 import junit.framework.AssertionFailedError;
@@ -182,7 +182,7 @@ public class MapperTest extends TestCase {
         t.test1();
     }
 
-    private class TaskdefForCopyTest extends TaskdefsTest {
+    private class TaskdefForCopyTest extends BuildFileTest {
         TaskdefForCopyTest(String name) {
             super(name);
         }