diff --git a/src/etc/testcases/taskdefs/optional/depend/depend.xml b/src/etc/testcases/taskdefs/optional/depend/depend.xml index ad316b13b..d11bf1632 100644 --- a/src/etc/testcases/taskdefs/optional/depend/depend.xml +++ b/src/etc/testcases/taskdefs/optional/depend/depend.xml @@ -17,48 +17,50 @@ --> + + + + + + + + + - - - This buildfile is used as part of Ant's test suite. - - - - - + - + - + - + - + @@ -69,11 +71,6 @@ - - - - - diff --git a/src/etc/testcases/taskdefs/optional/i18n/translate/translate.xml b/src/etc/testcases/taskdefs/optional/i18n/translate/translate.xml index a82e5fc72..e6debd500 100644 --- a/src/etc/testcases/taskdefs/optional/i18n/translate/translate.xml +++ b/src/etc/testcases/taskdefs/optional/i18n/translate/translate.xml @@ -16,30 +16,29 @@ limitations under the License. --> - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/src/etc/testcases/taskdefs/optional/image/image.xml b/src/etc/testcases/taskdefs/optional/image/image.xml index bc93b0c40..2fefa04c9 100644 --- a/src/etc/testcases/taskdefs/optional/image/image.xml +++ b/src/etc/testcases/taskdefs/optional/image/image.xml @@ -18,59 +18,56 @@ - - + - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + destdir="${output}" overwrite="no" failonerror="no"> - - + + diff --git a/src/etc/testcases/taskdefs/optional/unix/symlink.xml b/src/etc/testcases/taskdefs/optional/unix/symlink.xml index d257d5c78..bd0131748 100644 --- a/src/etc/testcases/taskdefs/optional/unix/symlink.xml +++ b/src/etc/testcases/taskdefs/optional/unix/symlink.xml @@ -46,31 +46,31 @@ - + - - - + + + + depends="setUp, test-single, test-delete, test-record, test-recreate, tearDown"/> - - + - - @@ -82,23 +82,23 @@ Creates: (none) Deletes: - Link: ${tdir}/singletest + Link: ${output}/singletest --> - - + - - + + - - @@ -110,127 +110,127 @@ - - - - - + + + + + - - - + + + - - - - - - - + - - - - - - - - - - - - - - - - @@ -241,95 +241,95 @@ - - - - + + + + - + - - - - - - + - - - - - - + - @@ -337,23 +337,18 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - - diff --git a/src/etc/testcases/taskdefs/rmic/rmic.xml b/src/etc/testcases/taskdefs/rmic/rmic.xml index d8709bd07..757fca517 100644 --- a/src/etc/testcases/taskdefs/rmic/rmic.xml +++ b/src/etc/testcases/taskdefs/rmic/rmic.xml @@ -15,20 +15,23 @@ See the License for the specific language governing permissions and limitations under the License. --> - + - - - - - + + + + + + + + - + diff --git a/src/etc/testcases/taskdefs/style/build.xml b/src/etc/testcases/taskdefs/style/build.xml index 1b0d35e6a..c91d10f69 100644 --- a/src/etc/testcases/taskdefs/style/build.xml +++ b/src/etc/testcases/taskdefs/style/build.xml @@ -16,59 +16,55 @@ limitations under the License. --> - + - + - - + + - - - - - + - + - + - + - + - + - + @@ -76,7 +72,7 @@ - + @@ -84,7 +80,7 @@ - @@ -95,26 +91,26 @@ - + - + - - - + + - - - + + @@ -127,13 +123,13 @@ - + @@ -143,7 +139,7 @@ - + @@ -152,15 +148,14 @@ - - - - - - + + + + + - - - - - - + + + + + - - - - - - + + + + + diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java index 708312b97..c31556ff5 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/RmicAdvancedTest.java @@ -44,13 +44,6 @@ public class RmicAdvancedTest extends BuildFileTest { configureProject(TASKDEFS_DIR + "rmic.xml"); } - /** - * The teardown method for JUnit - */ - public void tearDown() { - executeTarget("teardown"); - } - /** * verify that "default" binds us to the default compiler */ diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/StyleTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/StyleTest.java index abfffb6f8..34f356abb 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/StyleTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/StyleTest.java @@ -18,6 +18,7 @@ package org.apache.tools.ant.taskdefs; +import java.io.File; import java.io.FileReader; import java.io.IOException; import java.io.Reader; @@ -45,10 +46,6 @@ public class StyleTest extends BuildFileTest { //commented out for performance while target is empty } - protected void tearDown() throws Exception { - executeTarget("teardown"); - } - public void testStyleIsSet() throws Exception { expectSpecificBuildException("testStyleIsSet", "no stylesheet specified", "specify the " + @@ -58,31 +55,31 @@ public class StyleTest extends BuildFileTest { public void testTransferParameterSet() throws Exception { expectFileContains("testTransferParameterSet", // target - "out/out.xml", // file + getOutputDir().getAbsoluteFile() + "/out.xml", // file "set='myvalue'"); // exptected string } public void testTransferParameterEmpty() throws Exception { expectFileContains("testTransferParameterEmpty", - "out/out.xml", + getOutputDir().getAbsoluteFile() + "/out.xml", "empty=''"); } public void testTransferParameterUnset() throws Exception { expectFileContains("testTransferParameterUnset", - "out/out.xml", + getOutputDir().getAbsoluteFile() + "/out.xml", "undefined='${value}'"); } public void testTransferParameterUnsetWithIf() throws Exception { expectFileContains("testTransferParameterUnsetWithIf", - "out/out.xml", + getOutputDir().getAbsoluteFile() + "/out.xml", "undefined='undefined default value'"); } public void testNewerStylesheet() throws Exception { expectFileContains("testNewerStylesheet", - "out/out.xml", + getOutputDir().getAbsoluteFile() + "/out.xml", "new-value"); } @@ -95,40 +92,36 @@ public class StyleTest extends BuildFileTest { } public void testDefaultMapper(String target) throws Exception { - assertTrue(!(FileUtils.getFileUtils().resolveFile( - getProject().getBaseDir(),"out/data.html")).exists()); + assertTrue(!( + new File(getOutputDir().getAbsoluteFile(), "data.html").exists())); expectFileContains(target, - "out/data.html", + getOutputDir().getAbsoluteFile() + "/data.html", "set='myvalue'"); } public void testCustomMapper() throws Exception { - assertTrue(!FILE_UTILS.resolveFile( - getProject().getBaseDir(), "out/out.xml").exists()); + assertTrue(!new File(getOutputDir().getAbsoluteFile(), "out.xml").exists()); expectFileContains("testCustomMapper", - "out/out.xml", + getOutputDir().getAbsoluteFile() + "/out.xml", "set='myvalue'"); } public void testTypedMapper() throws Exception { - assertTrue(!FILE_UTILS.resolveFile( - getProject().getBaseDir(), "out/out.xml").exists()); + assertTrue(!new File(getOutputDir().getAbsoluteFile(), "out.xml").exists()); expectFileContains("testTypedMapper", - "out/out.xml", + getOutputDir().getAbsoluteFile() + "/out.xml", "set='myvalue'"); } public void testDirectoryHierarchyWithDirMatching() throws Exception { executeTarget("testDirectoryHierarchyWithDirMatching"); - assertTrue(FILE_UTILS.resolveFile( - getProject().getBaseDir(), "out/dest/level1/data.html") + assertTrue(new File(getOutputDir().getAbsoluteFile(), "dest/level1/data.html") .exists()); } public void testDirsWithSpaces() throws Exception { executeTarget("testDirsWithSpaces"); - assertTrue(FILE_UTILS.resolveFile( - getProject().getBaseDir(), "out/d est/data.html") + assertTrue(new File(getOutputDir().getAbsoluteFile(), "d est/data.html") .exists()); } @@ -141,36 +134,36 @@ public class StyleTest extends BuildFileTest { } public void testWithFileResource() throws Exception { - expectFileContains("testWithFileResource", "out/out.xml", "set='value'"); + expectFileContains("testWithFileResource", getOutputDir().getAbsoluteFile() + "/out.xml", "set='value'"); } public void testWithUrlResource() throws Exception { - expectFileContains("testWithUrlResource", "out/out.xml", "set='value'"); + expectFileContains("testWithUrlResource", getOutputDir().getAbsoluteFile() + "/out.xml", "set='value'"); } public void testFilenameAsParam() throws Exception { executeTarget("testFilenameAsParam"); - assertFileContains("out/out/one.txt", "filename='one.xml'"); - assertFileContains("out/out/two.txt", "filename='two.xml'"); - assertFileContains("out/out/three.txt", "filename='three.xml'"); - assertFileContains("out/out/dir/four.txt", "filename='four.xml'"); - assertFileContains("out/out/dir/four.txt", "filedir ='-not-set-'"); + assertFileContains(getOutputDir().getAbsoluteFile() + "/one.txt", "filename='one.xml'"); + assertFileContains(getOutputDir().getAbsoluteFile() + "/two.txt", "filename='two.xml'"); + assertFileContains(getOutputDir().getAbsoluteFile() + "/three.txt", "filename='three.xml'"); + assertFileContains(getOutputDir().getAbsoluteFile() + "/dir/four.txt", "filename='four.xml'"); + assertFileContains(getOutputDir().getAbsoluteFile() + "/dir/four.txt", "filedir ='-not-set-'"); } public void testFilenameAsParamNoSetting() throws Exception { executeTarget("testFilenameAsParamNoSetting"); - assertFileContains("out/out/one.txt", "filename='-not-set-'"); - assertFileContains("out/out/two.txt", "filename='-not-set-'"); - assertFileContains("out/out/three.txt", "filename='-not-set-'"); - assertFileContains("out/out/dir/four.txt", "filename='-not-set-'"); + assertFileContains(getOutputDir().getAbsoluteFile() + "/one.txt", "filename='-not-set-'"); + assertFileContains(getOutputDir().getAbsoluteFile() + "/two.txt", "filename='-not-set-'"); + assertFileContains(getOutputDir().getAbsoluteFile() + "/three.txt", "filename='-not-set-'"); + assertFileContains(getOutputDir().getAbsoluteFile() + "/dir/four.txt", "filename='-not-set-'"); } public void testFilenameAndFiledirAsParam() throws Exception { executeTarget("testFilenameAndFiledirAsParam"); - assertFileContains("out/out/one.txt", "filename='one.xml'"); - assertFileContains("out/out/one.txt", "filedir ='.'"); - assertFileContains("out/out/dir/four.txt", "filename='four.xml'"); - assertFileContains("out/out/dir/four.txt", "filedir ='dir'"); + assertFileContains(getOutputDir().getAbsoluteFile() + "/one.txt", "filename='one.xml'"); + assertFileContains(getOutputDir().getAbsoluteFile() + "/one.txt", "filedir ='.'"); + assertFileContains(getOutputDir().getAbsoluteFile() + "/dir/four.txt", "filename='four.xml'"); + assertFileContains(getOutputDir().getAbsoluteFile() + "/dir/four.txt", "filedir ='dir'"); } diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java index 82f301e8b..020dcb7aa 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/depend/DependTest.java @@ -42,10 +42,6 @@ public class DependTest extends BuildFileTest { configureProject(TEST_BUILD_FILE); } - public void tearDown() { - executeTarget("clean"); - } - /** * Test direct dependency removal */ diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/i18n/TranslateTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/i18n/TranslateTest.java index 64b588580..311e7714b 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/i18n/TranslateTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/i18n/TranslateTest.java @@ -43,27 +43,21 @@ public class TranslateTest extends BuildFileTest { configureProject(TASKDEFS_DIR + "/translate.xml"); } - public void tearDown() { - executeTarget("cleanup"); - } - public void test1() { executeTarget("test1"); - assertTrue("translation of "+ TASKDEFS_DIR + "/input/template.txt",compareFiles(TASKDEFS_DIR+"/expected/de/template.txt",TASKDEFS_DIR+"/output/de/template.txt")); + assertTrue("translation of "+ TASKDEFS_DIR + "/input/template.txt",compareFiles(new File(getProjectDir(), "expected/de/template.txt"), + new File(getOutputDir(), "de/template.txt"))); } - private boolean compareFiles(String name1, String name2) { - File file1 = new File(System.getProperty("root"), name1); - File file2 = new File(System.getProperty("root"), name2); - + private boolean compareFiles(File file1, File file2) { try { if (!file1.exists() || !file2.exists()) { - System.out.println("One or both files do not exist:" + name1 + ", " + name2); + System.out.println("One or both files do not exist:" + file1.getAbsoluteFile() + ", " + file2.getAbsoluteFile()); return false; } if (file1.length() != file2.length()) { - System.out.println("File size mismatch:" + name1 + "(" + file1.length() + "), " + - name2 + "(" + file2.length() + ")"); + System.out.println("File size mismatch:" + file1.getAbsoluteFile() + "(" + file1.length() + "), " + + file2.getAbsoluteFile() + "(" + file2.length() + ")"); return false; } @@ -79,7 +73,7 @@ public class TranslateTest extends BuildFileTest { fis2.read(buffer2); for (int i = 0; i < read; ++i, ++index) { if (buffer1[i] != buffer2[i]) { - System.out.println("Bytes mismatch:" + name1 + ", " + name2 + + System.out.println("Bytes mismatch:" + file1.getAbsoluteFile() + ", " + file2.getAbsoluteFile() + " at byte " + index); return false; } @@ -88,7 +82,7 @@ public class TranslateTest extends BuildFileTest { return true; } catch (IOException e) { - System.out.println("IOException comparing files: " + name1 + ", " + name2); + System.out.println("IOException comparing files: " + file1.getAbsoluteFile() + ", " + file2.getAbsoluteFile()); return false; } } diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageTest.java index 5769345b7..a1f2947fa 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/image/ImageTest.java @@ -47,17 +47,13 @@ public class ImageTest extends BuildFileTest { } - public void tearDown() { - executeTarget("cleanup"); - } - public void testEchoToLog() { expectLogContaining("testEchoToLog", "Processing File"); } public void testSimpleScale(){ expectLogContaining("testSimpleScale", "Processing File"); - File f = createRelativeFile("/dest/" + LARGEIMAGE); + File f = new File(getOutputDir(), LARGEIMAGE); assertTrue( "Did not create "+f.getAbsolutePath(), f.exists()); @@ -66,7 +62,7 @@ public class ImageTest extends BuildFileTest { public void testOverwriteTrue() { expectLogContaining("testSimpleScale", "Processing File"); - File f = createRelativeFile("/dest/" + LARGEIMAGE); + File f = new File(getOutputDir(), LARGEIMAGE); long lastModified = f.lastModified(); try { Thread.sleep(FILE_UTILS @@ -74,7 +70,7 @@ public class ImageTest extends BuildFileTest { } catch (InterruptedException e) {} expectLogContaining("testOverwriteTrue", "Processing File"); - f = createRelativeFile("/dest/" + LARGEIMAGE); + f = new File(getOutputDir(), LARGEIMAGE); long overwrittenLastModified = f.lastModified(); assertTrue("File was not overwritten.", lastModified < overwrittenLastModified); @@ -82,10 +78,10 @@ public class ImageTest extends BuildFileTest { public void testOverwriteFalse() { expectLogContaining("testSimpleScale", "Processing File"); - File f = createRelativeFile("/dest/" + LARGEIMAGE); + File f = new File(getOutputDir(), LARGEIMAGE); long lastModified = f.lastModified(); expectLogContaining("testOverwriteFalse", "Processing File"); - f = createRelativeFile("/dest/" + LARGEIMAGE); + f = new File(getOutputDir(), LARGEIMAGE); long overwrittenLastModified = f.lastModified(); assertTrue("File was overwritten.", lastModified == overwrittenLastModified); @@ -93,7 +89,7 @@ public class ImageTest extends BuildFileTest { public void testSimpleScaleWithMapper() { expectLogContaining("testSimpleScaleWithMapper", "Processing File"); - File f = createRelativeFile("/dest/scaled-" + LARGEIMAGE); + File f = new File(getOutputDir(), "scaled-" + LARGEIMAGE); assertTrue( "Did not create "+f.getAbsolutePath(), f.exists()); @@ -113,15 +109,5 @@ public class ImageTest extends BuildFileTest { .indexOf("Unable to process image stream") > -1); } } - - - - protected File createRelativeFile(String filename) { - if (filename.equals(".")) { - return getProjectDir(); - } - // else - return new File(getProjectDir(), filename); - } } diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java index 31dbeef32..8a108d343 100644 --- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java +++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/unix/SymlinkTest.java @@ -35,6 +35,8 @@ import org.apache.tools.ant.BuildFileTest; import org.apache.tools.ant.Project; import org.apache.tools.ant.util.SymbolicLinkUtils; +import java.io.File; + /** * Test cases for the Symlink task. Link creation, link deletion, recording * of links in multiple directories, and restoration of links recorded are @@ -56,7 +58,7 @@ public class SymlinkTest extends BuildFileTest { public void setUp() { if (supportsSymlinks) { configureProject("src/etc/testcases/taskdefs/optional/unix/symlink.xml"); - executeTarget("setup"); + executeTarget("setUp"); } } @@ -187,7 +189,7 @@ public class SymlinkTest extends BuildFileTest { executeTarget("test-fileutils"); SymbolicLinkUtils su = SymbolicLinkUtils.getSymbolicLinkUtils(); - java.io.File f = getProject().resolveFile("test-working/file1"); + java.io.File f = new File(getOutputDir(), "file1"); assertTrue(f.exists()); assertFalse(f.isDirectory()); assertTrue(f.isFile()); @@ -198,7 +200,7 @@ public class SymlinkTest extends BuildFileTest { assertFalse(su.isDanglingSymbolicLink(f.getParentFile(), f.getName())); - f = getProject().resolveFile("test-working/dir1"); + f = new File(getOutputDir(), "dir1"); assertTrue(f.exists()); assertTrue(f.isDirectory()); assertFalse(f.isFile()); @@ -209,7 +211,7 @@ public class SymlinkTest extends BuildFileTest { assertFalse(su.isDanglingSymbolicLink(f.getParentFile(), f.getName())); - f = getProject().resolveFile("test-working/file2"); + f = new File(getOutputDir(), "file2"); assertFalse(f.exists()); assertFalse(f.isDirectory()); assertFalse(f.isFile()); @@ -220,7 +222,7 @@ public class SymlinkTest extends BuildFileTest { assertFalse(su.isDanglingSymbolicLink(f.getParentFile(), f.getName())); - f = getProject().resolveFile("test-working/dir2"); + f = new File(getOutputDir(), "dir2"); assertFalse(f.exists()); assertFalse(f.isDirectory()); assertFalse(f.isFile()); @@ -232,7 +234,7 @@ public class SymlinkTest extends BuildFileTest { f.getName())); - f = getProject().resolveFile("test-working/file.there"); + f = new File(getOutputDir(), "file.there"); assertTrue(f.exists()); assertFalse(f.isDirectory()); assertTrue(f.isFile()); @@ -243,7 +245,7 @@ public class SymlinkTest extends BuildFileTest { assertFalse(su.isDanglingSymbolicLink(f.getParentFile(), f.getName())); - f = getProject().resolveFile("test-working/dir.there"); + f = new File(getOutputDir(), "dir.there"); assertTrue(f.exists()); assertTrue(f.isDirectory()); assertFalse(f.isFile()); @@ -260,7 +262,7 @@ public class SymlinkTest extends BuildFileTest { // this is not true under Snow Leopard and JDK 1.5 // Removing special handling of MacOS until someone shouts // Antoine - f = getProject().resolveFile("test-working/file.notthere"); + f = new File(getOutputDir(), "file.notthere"); assertFalse(f.exists()); assertFalse(f.isDirectory()); assertFalse(f.isFile()); @@ -270,7 +272,7 @@ public class SymlinkTest extends BuildFileTest { assertTrue(su.isDanglingSymbolicLink(f.getParentFile(), f.getName())); - f = getProject().resolveFile("test-working/dir.notthere"); + f = new File(getOutputDir(), "dir.notthere"); assertFalse(f.exists()); assertFalse(f.isDirectory()); assertFalse(f.isFile()); @@ -285,7 +287,7 @@ public class SymlinkTest extends BuildFileTest { public void tearDown() { if (supportsSymlinks) { - executeTarget("teardown"); + executeTarget("tearDown"); } } diff --git a/src/tests/junit/org/apache/tools/ant/types/optional/depend/ClassFileSetTest.java b/src/tests/junit/org/apache/tools/ant/types/optional/depend/ClassFileSetTest.java index 0f97b8857..e79bd6ae3 100644 --- a/src/tests/junit/org/apache/tools/ant/types/optional/depend/ClassFileSetTest.java +++ b/src/tests/junit/org/apache/tools/ant/types/optional/depend/ClassFileSetTest.java @@ -42,10 +42,6 @@ public class ClassFileSetTest extends BuildFileTest { configureProject("src/etc/testcases/taskdefs/optional/depend/depend.xml"); } - public void tearDown() { - executeTarget("clean"); - } - /** * Test basic classfileset */