(1) make the Path tests work on Windows even if not working on C: Submitted by: Erik Meade <emeade@geekfarm.org> (2) Take care of deprecation warnings and added functionality for some of the file handling tasks. git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@268054 13f79535-47bb-0310-9956-ffa450edef68master
@@ -62,7 +62,7 @@ import java.util.*; | |||||
/** | /** | ||||
* JUnit 3 testcases for org.apache.tools.ant.IntrospectionHelper. | * JUnit 3 testcases for org.apache.tools.ant.IntrospectionHelper. | ||||
* | * | ||||
* @author Stefan Bodewig <a href="mailto:stefan.bodewig@megabit.net">stefan.bodewig@megabit.net</a> | |||||
* @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a> | |||||
*/ | */ | ||||
public class IntrospectionHelperTest extends TestCase { | public class IntrospectionHelperTest extends TestCase { | ||||
@@ -409,7 +409,7 @@ public class IntrospectionHelperTest extends TestCase { | |||||
if (isUnixStyle) { | if (isUnixStyle) { | ||||
assertEquals("/tmp/2", f.getAbsolutePath()); | assertEquals("/tmp/2", f.getAbsolutePath()); | ||||
} else { | } else { | ||||
assertEquals("c:\\tmp\\2", f.getAbsolutePath().toLowerCase()); | |||||
assertEquals(":\\tmp\\2", f.getAbsolutePath().toLowerCase().substring(1)); | |||||
} | } | ||||
} | } | ||||
@@ -80,7 +80,7 @@ public class CopydirTest extends TaskdefsTest { | |||||
} | } | ||||
public void test4() { | public void test4() { | ||||
expectLog("test4", "Warning: src == dest"); | |||||
expectLog("test4", "DEPRECATED - The copydir task is deprecated. Use copy instead.Warning: src == dest"); | |||||
} | } | ||||
public void test5() { | public void test5() { | ||||
@@ -80,7 +80,7 @@ public class CopyfileTest extends TaskdefsTest { | |||||
} | } | ||||
public void test4() { | public void test4() { | ||||
expectLog("test4", "Warning: src == dest"); | |||||
expectLog("test4", "DEPRECATED - The copyfile task is deprecated. Use copy instead.Warning: src == dest"); | |||||
} | } | ||||
public void test5() { | public void test5() { | ||||
@@ -75,9 +75,10 @@ public class DeleteTest extends TaskdefsTest { | |||||
executeTarget("test2"); | executeTarget("test2"); | ||||
} | } | ||||
public void test3() { | |||||
expectBuildException("test3", "Not a directory"); | |||||
} | |||||
// delete now handles files *and* directories --SB | |||||
// public void test3() { | |||||
// expectBuildException("test3", "Not a directory"); | |||||
// } | |||||
public void test4() { | public void test4() { | ||||
executeTarget("test4"); | executeTarget("test4"); | ||||
@@ -65,7 +65,7 @@ import java.io.File; | |||||
/** | /** | ||||
* JUnit 3 testcases for org.apache.tools.ant.types.Path | * JUnit 3 testcases for org.apache.tools.ant.types.Path | ||||
* | * | ||||
* @author <a href="mailto:stefan.bodewig@megabit.net">Stefan Bodewig</a> | |||||
* @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a> | |||||
*/ | */ | ||||
public class PathTest extends TestCase { | public class PathTest extends TestCase { | ||||
@@ -92,8 +92,8 @@ public class PathTest extends TestCase { | |||||
assertEquals("/a", l[0]); | assertEquals("/a", l[0]); | ||||
assertEquals("/b", l[1]); | assertEquals("/b", l[1]); | ||||
} else { | } else { | ||||
assertEquals("\\a", l[0]); | |||||
assertEquals("\\b", l[1]); | |||||
assertEquals(":\\a", l[0].substring(1)); | |||||
assertEquals(":\\b", l[1].substring(1)); | |||||
} | } | ||||
p = new Path(project, "\\a;\\b"); | p = new Path(project, "\\a;\\b"); | ||||
@@ -103,8 +103,8 @@ public class PathTest extends TestCase { | |||||
assertEquals("/a", l[0]); | assertEquals("/a", l[0]); | ||||
assertEquals("/b", l[1]); | assertEquals("/b", l[1]); | ||||
} else { | } else { | ||||
assertEquals("\\a", l[0]); | |||||
assertEquals("\\b", l[1]); | |||||
assertEquals(":\\a", l[0].substring(1)); | |||||
assertEquals(":\\b", l[1].substring(1)); | |||||
} | } | ||||
p = new Path(project, "\\a;\\b:/c"); | p = new Path(project, "\\a;\\b:/c"); | ||||
@@ -115,9 +115,9 @@ public class PathTest extends TestCase { | |||||
assertEquals("/b", l[1]); | assertEquals("/b", l[1]); | ||||
assertEquals("/c", l[2]); | assertEquals("/c", l[2]); | ||||
} else { | } else { | ||||
assertEquals("\\a", l[0]); | |||||
assertEquals("\\b", l[1]); | |||||
assertEquals("\\c", l[2]); | |||||
assertEquals(":\\a", l[0].substring(1)); | |||||
assertEquals(":\\b", l[1].substring(1)); | |||||
assertEquals(":\\c", l[2].substring(1)); | |||||
} | } | ||||
p = new Path(project, "c:\\test"); | p = new Path(project, "c:\\test"); | ||||
@@ -154,7 +154,7 @@ public class PathTest extends TestCase { | |||||
assertEquals("/a", l[0]); | assertEquals("/a", l[0]); | ||||
} else { | } else { | ||||
assertEquals(1, l.length); | assertEquals(1, l.length); | ||||
assertEquals("\\a", l[0]); | |||||
assertEquals(":\\a", l[0].substring(1)); | |||||
} | } | ||||
} | } | ||||
@@ -314,7 +314,7 @@ public class PathTest extends TestCase { | |||||
if (isUnixStyle) { | if (isUnixStyle) { | ||||
assertEquals("/a", l[0]); | assertEquals("/a", l[0]); | ||||
} else { | } else { | ||||
assertEquals("\\a", l[0]); | |||||
assertEquals(":\\a", l[0].substring(1)); | |||||
} | } | ||||
} | } | ||||