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

@@ -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);

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);

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);

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);

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";

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);

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);

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");

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);

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);

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);

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);

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);

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);

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);

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);

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);

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);

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";

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);

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);

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);

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);

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/";

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);

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);

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 { 
     

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);

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);

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);

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/";
 

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);

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);

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);

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);
         }