conor 01/11/14 04:25:31
Modified: src/testcases/org/apache/tools/ant IncludeTest.java
src/testcases/org/apache/tools/ant/taskdefs
AntStructureTest.java AntTest.java
AvailableTest.java CVSPassTest.java CopyTest.java
CopydirTest.java CopyfileTest.java DeleteTest.java
DeltreeTest.java DependSetTest.java EchoTest.java
FailTest.java FilterTest.java FixCrLfTest.java
GUnzipTest.java GetTest.java GzipTest.java
JarTest.java MkdirTest.java PropertyTest.java
RenameTest.java ReplaceTest.java SleepTest.java
TarTest.java TaskdefTest.java TaskdefsTest.java
TypedefTest.java UnzipTest.java ZipTest.java
src/testcases/org/apache/tools/ant/taskdefs/optional
ANTLRTest.java PropertyFileTest.java PvcsTest.java
ReplaceRegExpTest.java
src/testcases/org/apache/tools/ant/types MapperTest.java
Log:
Move all tests to BuildFileTest from TaskdefsTest
Revision Changes Path
1.3 +2 -2
jakarta-ant/src/testcases/org/apache/tools/ant/IncludeTest.java
Index: IncludeTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/IncludeTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -u -r1.2 -r1.3
--- IncludeTest.java 2001/02/18 13:44:43 1.2
+++ IncludeTest.java 2001/11/14 12:25:30 1.3
@@ -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);
1.3 +2 -1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/AntStructureTest.java
Index: AntStructureTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/AntStructureTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -u -r1.2 -r1.3
--- AntStructureTest.java 2001/01/03 14:18:48 1.2
+++ AntStructureTest.java 2001/11/14 12:25:30 1.3
@@ -54,10 +54,11 @@
package org.apache.tools.ant.taskdefs;
+import org.apache.tools.ant.BuildFileTest;
/**
* @author Nico Seessle <[EMAIL PROTECTED]>
*/
-public class AntStructureTest extends TaskdefsTest {
+public class AntStructureTest extends BuildFileTest {
public AntStructureTest(String name) {
super(name);
1.5 +3 -2
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/AntTest.java
Index: AntTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/AntTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -u -r1.4 -r1.5
--- AntTest.java 2001/11/06 13:21:44 1.4
+++ AntTest.java 2001/11/14 12:25:30 1.5
@@ -61,12 +61,13 @@
import org.apache.tools.ant.BuildEvent;
import org.apache.tools.ant.BuildListener;
+import org.apache.tools.ant.BuildFileTest;
/**
* @author Nico Seessle <[EMAIL PROTECTED]>
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
-public class AntTest extends TaskdefsTest {
+public class AntTest extends BuildFileTest {
public AntTest(String name) {
super(name);
1.6 +2 -1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java
Index: AvailableTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/AvailableTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -u -r1.5 -r1.6
--- AvailableTest.java 2001/10/23 10:35:14 1.5
+++ AvailableTest.java 2001/11/14 12:25:30 1.6
@@ -54,10 +54,11 @@
package org.apache.tools.ant.taskdefs;
+import org.apache.tools.ant.BuildFileTest;
/**
* @author Nico Seessle <[EMAIL PROTECTED]>
*/
-public class AvailableTest extends TaskdefsTest {
+public class AvailableTest extends BuildFileTest {
public AvailableTest(String name) {
super(name);
1.4 +2 -1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/CVSPassTest.java
Index: CVSPassTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/CVSPassTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -u -r1.3 -r1.4
--- CVSPassTest.java 2001/10/23 10:35:14 1.3
+++ CVSPassTest.java 2001/11/14 12:25:30 1.4
@@ -56,13 +56,14 @@
import java.io.*;
import org.apache.tools.ant.*;
+import org.apache.tools.ant.BuildFileTest;
/**
* Tests CVSLogin task.
*
* @author <a href="mailto:[EMAIL PROTECTED]">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:[EMAIL PROTECTED]:/home/cvspublic Ay=0=h<Z";
1.2 +3 -1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/CopyTest.java
Index: CopyTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/CopyTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -u -r1.1 -r1.2
--- CopyTest.java 2001/03/08 15:17:23 1.1
+++ CopyTest.java 2001/11/14 12:25:30 1.2
@@ -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 <[EMAIL PROTECTED]>
*/
-public class CopyTest extends TaskdefsTest {
+public class CopyTest extends BuildFileTest {
public CopyTest(String name) {
super(name);
1.5 +2 -1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java
Index: CopydirTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/CopydirTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -u -r1.4 -r1.5
--- CopydirTest.java 2001/03/08 15:17:23 1.4
+++ CopydirTest.java 2001/11/14 12:25:30 1.5
@@ -55,11 +55,12 @@
package org.apache.tools.ant.taskdefs;
import java.io.File;
+import org.apache.tools.ant.BuildFileTest;
/**
* @author Nico Seessle <[EMAIL PROTECTED]>
*/
-public class CopydirTest extends TaskdefsTest {
+public class CopydirTest extends BuildFileTest {
public CopydirTest(String name) {
super(name);
1.6 +2 -1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java
Index: CopyfileTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/CopyfileTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -w -u -r1.5 -r1.6
--- CopyfileTest.java 2001/07/07 10:19:31 1.5
+++ CopyfileTest.java 2001/11/14 12:25:30 1.6
@@ -55,11 +55,12 @@
package org.apache.tools.ant.taskdefs;
import java.io.File;
+import org.apache.tools.ant.BuildFileTest;
/**
* @author Nico Seessle <[EMAIL PROTECTED]>
*/
-public class CopyfileTest extends TaskdefsTest {
+public class CopyfileTest extends BuildFileTest {
public void test6() {
expectBuildException("test6", "target is directory");
1.4 +3 -1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/DeleteTest.java
Index: DeleteTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/DeleteTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -u -r1.3 -r1.4
--- DeleteTest.java 2001/01/03 14:18:49 1.3
+++ DeleteTest.java 2001/11/14 12:25:30 1.4
@@ -54,10 +54,12 @@
package org.apache.tools.ant.taskdefs;
+import org.apache.tools.ant.BuildFileTest;
+
/**
* @author Nico Seessle <[EMAIL PROTECTED]>
*/
-public class DeleteTest extends TaskdefsTest {
+public class DeleteTest extends BuildFileTest {
public DeleteTest(String name) {
super(name);
1.3 +3 -1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/DeltreeTest.java
Index: DeltreeTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/DeltreeTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -u -r1.2 -r1.3
--- DeltreeTest.java 2001/01/03 14:18:49 1.2
+++ DeltreeTest.java 2001/11/14 12:25:30 1.3
@@ -54,10 +54,12 @@
package org.apache.tools.ant.taskdefs;
+import org.apache.tools.ant.BuildFileTest;
+
/**
* @author Nico Seessle <[EMAIL PROTECTED]>
*/
-public class DeltreeTest extends TaskdefsTest {
+public class DeltreeTest extends BuildFileTest {
public DeltreeTest(String name) {
super(name);
1.2 +3 -1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/DependSetTest.java
Index: DependSetTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/DependSetTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -u -r1.1 -r1.2
--- DependSetTest.java 2001/08/06 14:32:46 1.1
+++ DependSetTest.java 2001/11/14 12:25:30 1.2
@@ -54,12 +54,14 @@
package org.apache.tools.ant.taskdefs;
+import org.apache.tools.ant.BuildFileTest;
+
/**
* Tests DependSet.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Craeg Strong</a>
*/
-public class DependSetTest extends TaskdefsTest {
+public class DependSetTest extends BuildFileTest {
public DependSetTest(String name) {
super(name);
1.5 +3 -1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/EchoTest.java
Index: EchoTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/EchoTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -u -r1.4 -r1.5
--- EchoTest.java 2001/01/03 14:18:49 1.4
+++ EchoTest.java 2001/11/14 12:25:30 1.5
@@ -54,10 +54,12 @@
package org.apache.tools.ant.taskdefs;
+import org.apache.tools.ant.BuildFileTest;
+
/**
* @author Nico Seessle <[EMAIL PROTECTED]>
*/
-public class EchoTest extends TaskdefsTest {
+public class EchoTest extends BuildFileTest {
public EchoTest(String name) {
super(name);
1.3 +3 -1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/FailTest.java
Index: FailTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/FailTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -u -r1.2 -r1.3
--- FailTest.java 2001/01/03 14:18:49 1.2
+++ FailTest.java 2001/11/14 12:25:30 1.3
@@ -54,10 +54,12 @@
package org.apache.tools.ant.taskdefs;
+import org.apache.tools.ant.BuildFileTest;
+
/**
* @author Nico Seessle <[EMAIL PROTECTED]>
*/
-public class FailTest extends TaskdefsTest {
+public class FailTest extends BuildFileTest {
public FailTest(String name) {
super(name);
1.5 +2 -1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/FilterTest.java
Index: FilterTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/FilterTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -u -r1.4 -r1.5
--- FilterTest.java 2001/03/08 15:17:24 1.4
+++ FilterTest.java 2001/11/14 12:25:30 1.5
@@ -59,11 +59,12 @@
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
+import org.apache.tools.ant.BuildFileTest;
/**
* @author Nico Seessle <[EMAIL PROTECTED]>
*/
-public class FilterTest extends TaskdefsTest {
+public class FilterTest extends BuildFileTest {
public FilterTest(String name) {
super(name);
1.5 +2 -1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java
Index: FixCrLfTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/FixCrLfTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -u -r1.4 -r1.5
--- FixCrLfTest.java 2001/11/13 14:49:48 1.4
+++ FixCrLfTest.java 2001/11/14 12:25:30 1.5
@@ -57,12 +57,13 @@
import java.io.*;
import junit.framework.AssertionFailedError;
+import org.apache.tools.ant.BuildFileTest;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Peter B. West</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
*/
-public class FixCrLfTest extends TaskdefsTest {
+public class FixCrLfTest extends BuildFileTest {
public FixCrLfTest(String name) {
super(name);
1.4 +4 -4
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/GUnzipTest.java
Index: GUnzipTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/GUnzipTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -u -r1.3 -r1.4
--- GUnzipTest.java 2001/03/08 15:17:24 1.3
+++ GUnzipTest.java 2001/11/14 12:25:30 1.4
@@ -51,15 +51,15 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-
package org.apache.tools.ant.taskdefs;
import java.io.File;
+import org.apache.tools.ant.BuildFileTest;
/**
* @author Nico Seessle <[EMAIL PROTECTED]>
*/
-public class GUnzipTest extends TaskdefsTest {
+public class GUnzipTest extends BuildFileTest {
public GUnzipTest(String name) {
super(name);
1.5 +2 -1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/GetTest.java
Index: GetTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/GetTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -u -r1.4 -r1.5
--- GetTest.java 2001/03/08 15:17:24 1.4
+++ GetTest.java 2001/11/14 12:25:30 1.5
@@ -55,11 +55,12 @@
package org.apache.tools.ant.taskdefs;
import java.io.File;
+import org.apache.tools.ant.BuildFileTest;
/**
* @author Nico Seessle <[EMAIL PROTECTED]>
*/
-public class GetTest extends TaskdefsTest {
+public class GetTest extends BuildFileTest {
public GetTest(String name) {
super(name);
1.4 +2 -1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/GzipTest.java
Index: GzipTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/GzipTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -u -r1.3 -r1.4
--- GzipTest.java 2001/03/08 15:17:25 1.3
+++ GzipTest.java 2001/11/14 12:25:30 1.4
@@ -55,11 +55,12 @@
package org.apache.tools.ant.taskdefs;
import java.io.File;
+import org.apache.tools.ant.BuildFileTest;
/**
* @author Nico Seessle <[EMAIL PROTECTED]>
*/
-public class GzipTest extends TaskdefsTest {
+public class GzipTest extends BuildFileTest {
public GzipTest(String name) {
super(name);
1.5 +2 -1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java
Index: JarTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/JarTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -u -r1.4 -r1.5
--- JarTest.java 2001/10/23 10:35:14 1.4
+++ JarTest.java 2001/11/14 12:25:30 1.5
@@ -56,11 +56,12 @@
import java.io.File;
import java.util.Date;
+import org.apache.tools.ant.BuildFileTest;
/**
* @author Erik Meade <[EMAIL PROTECTED]>
*/
-public class JarTest extends TaskdefsTest {
+public class JarTest extends BuildFileTest {
private static long jarModifiedDate;
private static String tempJar = "tmp.jar";
1.5 +4 -3
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/MkdirTest.java
Index: MkdirTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/MkdirTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -u -r1.4 -r1.5
--- MkdirTest.java 2001/03/08 15:17:25 1.4
+++ MkdirTest.java 2001/11/14 12:25:30 1.5
@@ -1,5 +1,3 @@
-package org.apache.tools.ant.taskdefs;
-
/*
* The Apache Software License, Version 1.1
*
@@ -53,11 +51,14 @@
* 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 <[EMAIL PROTECTED]>
*/
-public class MkdirTest extends TaskdefsTest {
+public class MkdirTest extends BuildFileTest {
public MkdirTest(String name) {
super(name);
1.5 +2 -1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/PropertyTest.java
Index: PropertyTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/PropertyTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -u -r1.4 -r1.5
--- PropertyTest.java 2001/07/31 11:24:41 1.4
+++ PropertyTest.java 2001/11/14 12:25:30 1.5
@@ -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);
1.3 +2 -1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/RenameTest.java
Index: RenameTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/RenameTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -u -r1.2 -r1.3
--- RenameTest.java 2001/01/03 14:18:49 1.2
+++ RenameTest.java 2001/11/14 12:25:30 1.3
@@ -53,11 +53,12 @@
*/
package org.apache.tools.ant.taskdefs;
+import org.apache.tools.ant.BuildFileTest;
/**
* @author Nico Seessle <[EMAIL PROTECTED]>
*/
-public class RenameTest extends TaskdefsTest {
+public class RenameTest extends BuildFileTest {
public RenameTest(String name) {
super(name);
1.5 +3 -1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/ReplaceTest.java
Index: ReplaceTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/ReplaceTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -u -r1.4 -r1.5
--- ReplaceTest.java 2001/01/19 15:17:33 1.4
+++ ReplaceTest.java 2001/11/14 12:25:30 1.5
@@ -54,10 +54,12 @@
package org.apache.tools.ant.taskdefs;
+import org.apache.tools.ant.BuildFileTest;
+
/**
* @author Nico Seessle <[EMAIL PROTECTED]>
*/
-public class ReplaceTest extends TaskdefsTest {
+public class ReplaceTest extends BuildFileTest {
public ReplaceTest(String name) {
super(name);
1.4 +2 -1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/SleepTest.java
Index: SleepTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/SleepTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -u -r1.3 -r1.4
--- SleepTest.java 2001/10/23 10:35:14 1.3
+++ SleepTest.java 2001/11/14 12:25:30 1.4
@@ -54,11 +54,12 @@
package org.apache.tools.ant.taskdefs;
+import org.apache.tools.ant.BuildFileTest;
/**
* @author [EMAIL PROTECTED] 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/";
1.5 +2 -1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/TarTest.java
Index: TarTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/TarTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -u -r1.4 -r1.5
--- TarTest.java 2001/03/19 12:44:33 1.4
+++ TarTest.java 2001/11/14 12:25:30 1.5
@@ -53,11 +53,12 @@
*/
package org.apache.tools.ant.taskdefs;
+import org.apache.tools.ant.BuildFileTest;
/**
* @author Nico Seessle <[EMAIL PROTECTED]>
*/
-public class TarTest extends TaskdefsTest {
+public class TarTest extends BuildFileTest {
public TarTest(String name) {
super(name);
1.7 +2 -1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/TaskdefTest.java
Index: TaskdefTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/TaskdefTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -w -u -r1.6 -r1.7
--- TaskdefTest.java 2001/11/09 15:48:11 1.6
+++ TaskdefTest.java 2001/11/14 12:25:30 1.7
@@ -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 <[EMAIL PROTECTED]>
*/
-public class TaskdefTest extends TaskdefsTest {
+public class TaskdefTest extends BuildFileTest {
public TaskdefTest(String name) {
super(name);
1.9 +2 -0
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/TaskdefsTest.java
Index: TaskdefsTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/TaskdefsTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -w -u -r1.8 -r1.9
--- TaskdefsTest.java 2001/11/05 13:07:32 1.8
+++ TaskdefsTest.java 2001/11/14 12:25:30 1.9
@@ -60,6 +60,8 @@
/**
* @author Nico Seessle <[EMAIL PROTECTED]>
+ *
+ * @deprecated use BuildFileTest instead.
*/
public abstract class TaskdefsTest extends BuildFileTest {
1.2 +3 -2
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/TypedefTest.java
Index: TypedefTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/TypedefTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -u -r1.1 -r1.2
--- TypedefTest.java 2001/11/09 15:48:11 1.1
+++ TypedefTest.java 2001/11/14 12:25:30 1.2
@@ -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:[EMAIL PROTECTED]">Stefan Bodewig</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
-public class TypedefTest extends TaskdefsTest {
+public class TypedefTest extends BuildFileTest {
public TypedefTest(String name) {
super(name);
1.3 +2 -1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/UnzipTest.java
Index: UnzipTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/UnzipTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -u -r1.2 -r1.3
--- UnzipTest.java 2001/01/03 14:18:49 1.2
+++ UnzipTest.java 2001/11/14 12:25:30 1.3
@@ -53,11 +53,12 @@
*/
package org.apache.tools.ant.taskdefs;
+import org.apache.tools.ant.BuildFileTest;
/**
* @author Nico Seessle <[EMAIL PROTECTED]>
*/
-public class UnzipTest extends TaskdefsTest {
+public class UnzipTest extends BuildFileTest {
public UnzipTest(String name) {
super(name);
1.5 +2 -1
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java
Index: ZipTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/ZipTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -u -r1.4 -r1.5
--- ZipTest.java 2001/03/08 11:03:41 1.4
+++ ZipTest.java 2001/11/14 12:25:30 1.5
@@ -53,11 +53,12 @@
*/
package org.apache.tools.ant.taskdefs;
+import org.apache.tools.ant.BuildFileTest;
/**
* @author Nico Seessle <[EMAIL PROTECTED]>
*/
-public class ZipTest extends TaskdefsTest {
+public class ZipTest extends BuildFileTest {
public ZipTest(String name) {
super(name);
1.5 +2 -2
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/optional/ANTLRTest.java
Index: ANTLRTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/optional/ANTLRTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -u -r1.4 -r1.5
--- ANTLRTest.java 2001/10/23 10:35:14 1.4
+++ ANTLRTest.java 2001/11/14 12:25:31 1.5
@@ -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 <[EMAIL PROTECTED]>
*/
-public class ANTLRTest extends TaskdefsTest {
+public class ANTLRTest extends BuildFileTest {
private final static String TASKDEFS_DIR =
"src/etc/testcases/taskdefs/optional/antlr/";
1.3 +2 -2
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java
Index: PropertyFileTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/optional/PropertyFileTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -u -r1.2 -r1.3
--- PropertyFileTest.java 2001/10/18 10:16:18 1.2
+++ PropertyFileTest.java 2001/11/14 12:25:31 1.3
@@ -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 @@
[EMAIL PROTECTED] October 2, 2001
*/
-public class PropertyFileTest extends TaskdefsTest {
+public class PropertyFileTest extends BuildFileTest {
public PropertyFileTest(String name) {
super(name);
1.4 +2 -2
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/optional/PvcsTest.java
Index: PvcsTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/optional/PvcsTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -u -r1.3 -r1.4
--- PvcsTest.java 2001/07/13 13:57:49 1.3
+++ PvcsTest.java 2001/11/14 12:25:31 1.4
@@ -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 <[EMAIL PROTECTED]>
*/
-public class PvcsTest extends TaskdefsTest {
+public class PvcsTest extends BuildFileTest {
public PvcsTest(String name) {
super(name);
1.2 +3 -3
jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/optional/ReplaceRegExpTest.java
Index: ReplaceRegExpTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/taskdefs/optional/ReplaceRegExpTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -u -r1.1 -r1.2
--- ReplaceRegExpTest.java 2001/10/26 09:36:40 1.1
+++ ReplaceRegExpTest.java 2001/11/14 12:25:31 1.2
@@ -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;
@@ -63,9 +63,9 @@
* JUnit Testcase for the optional replaceregexp task.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
-public class ReplaceRegExpTest extends TaskdefsTest {
+public class ReplaceRegExpTest extends BuildFileTest {
public ReplaceRegExpTest(String name) {
super(name);
1.5 +2 -2
jakarta-ant/src/testcases/org/apache/tools/ant/types/MapperTest.java
Index: MapperTest.java
===================================================================
RCS file:
/home/cvs/jakarta-ant/src/testcases/org/apache/tools/ant/types/MapperTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -w -u -r1.4 -r1.5
--- MapperTest.java 2001/10/23 10:35:14 1.4
+++ MapperTest.java 2001/11/14 12:25:31 1.5
@@ -57,7 +57,7 @@
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 @@
t.test1();
}
- private class TaskdefForCopyTest extends TaskdefsTest {
+ private class TaskdefForCopyTest extends BuildFileTest {
TaskdefForCopyTest(String name) {
super(name);
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
