bodewig 01/11/06 05:21:44
Modified: src/etc/testcases/types filterset.xml
src/testcases/org/apache/tools/ant/taskdefs AntTest.java
Log:
make unit tests work on Windows (at least I hope so 8-)
Revision Changes Path
1.4 +0 -3 jakarta-ant/src/etc/testcases/types/filterset.xml
Index: filterset.xml
===================================================================
RCS file: /home/cvs/jakarta-ant/src/etc/testcases/types/filterset.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- filterset.xml 2001/08/30 13:26:36 1.3
+++ filterset.xml 2001/11/06 13:21:43 1.4
@@ -14,7 +14,6 @@
<copy file="filterseta.txt" tofile="dest1.txt">
<filterset refid="testset.one"/>
</copy>
- <fixcrlf eol="lf" srcdir="." includes="dest1.txt"/>
</target>
<target name="test2">
@@ -22,7 +21,6 @@
<copy file="filtersetb.txt" tofile="dest2.txt">
<filterset refid="testset.two"/>
</copy>
- <fixcrlf eol="lf" srcdir="." includes="dest2.txt"/>
</target>
<target name="test3">
@@ -31,7 +29,6 @@
<filterset refid="testset.one"/>
<filterset refid="testset.two"/>
</copy>
- <fixcrlf eol="lf" srcdir="." includes="dest3.txt"/>
</target>
<target name="cleanup">
1.4 +6 -9
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AntTest.java 2001/10/30 08:42:14 1.3
+++ AntTest.java 2001/11/06 13:21:44 1.4
@@ -64,19 +64,16 @@
/**
* @author Nico Seessle <[EMAIL PROTECTED]>
* @author <a href="mailto:[EMAIL PROTECTED]">Stefan Bodewig</a>
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class AntTest extends TaskdefsTest {
- private static final String TESTCASES_DIR = "src/etc/testcases";
- private static final String TASKDEFS_DIR = TESTCASES_DIR + "/taskdefs";
-
public AntTest(String name) {
super(name);
}
public void setUp() {
- configureProject(TASKDEFS_DIR + "/ant.xml");
+ configureProject("src/etc/testcases/taskdefs/ant.xml");
}
public void test1() {
@@ -107,7 +104,7 @@
public void testExplicitBasedir1() {
File dir1 = getProjectDir();
- File dir2 = new File(TESTCASES_DIR);
+ File dir2 = project.resolveFile("..");
testBaseDirs("explicitBasedir1",
new String[] {dir1.getAbsolutePath(),
dir2.getAbsolutePath()
@@ -116,7 +113,7 @@
public void testExplicitBasedir2() {
File dir1 = getProjectDir();
- File dir2 = new File(TESTCASES_DIR);
+ File dir2 = project.resolveFile("..");
testBaseDirs("explicitBasedir2",
new String[] {dir1.getAbsolutePath(),
dir2.getAbsolutePath()
@@ -130,7 +127,7 @@
public void testDoNotInheritBasedir() {
File dir1 = getProjectDir();
- File dir2 = new File(TASKDEFS_DIR+"/ant");
+ File dir2 = project.resolveFile("ant");
String basedir = getProjectDir().getAbsolutePath();
testBaseDirs("doNotInheritBasedir",
new String[] {dir1.getAbsolutePath(),
@@ -140,7 +137,7 @@
public void testBasedirTripleCall() {
File dir1 = getProjectDir();
- File dir2 = new File(TASKDEFS_DIR+"/ant");
+ File dir2 = project.resolveFile("ant");
testBaseDirs("tripleCall",
new String[] {dir1.getAbsolutePath(),
dir2.getAbsolutePath(),
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
