diff --git a/src/etc/testcases/taskdefs/move.xml b/src/etc/testcases/taskdefs/move.xml index e40e78516..b9ae5a21b 100644 --- a/src/etc/testcases/taskdefs/move.xml +++ b/src/etc/testcases/taskdefs/move.xml @@ -22,9 +22,30 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/src/testcases/org/apache/tools/ant/taskdefs/MoveTest.java b/src/testcases/org/apache/tools/ant/taskdefs/MoveTest.java index 5e37201cb..3d046f0c6 100644 --- a/src/testcases/org/apache/tools/ant/taskdefs/MoveTest.java +++ b/src/testcases/org/apache/tools/ant/taskdefs/MoveTest.java @@ -1,7 +1,7 @@ /* * The Apache Software License, Version 1.1 * - * Copyright (c) 2000-2002 The Apache Software Foundation. All rights + * Copyright (c) 2000-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without @@ -96,4 +96,17 @@ public class MoveTest extends BuildFileTest { assertTrue(tmp.exists()); assertTrue(fileUtils.contentEquals(tmp, check)); } + + /** Bugzilla Report 11732 */ + public void testDirectoryRemoval() throws IOException { + executeTarget("testDirectoryRemoval"); + assertTrue(!getProject().resolveFile("E/B/1").exists()); + assertTrue(getProject().resolveFile("E/C/2").exists()); + assertTrue(getProject().resolveFile("E/D/3").exists()); + assertTrue(getProject().resolveFile("A/B/1").exists()); + assertTrue(!getProject().resolveFile("A/C/2").exists()); + assertTrue(!getProject().resolveFile("A/D/3").exists()); + assertTrue(!getProject().resolveFile("A/C").exists()); + assertTrue(!getProject().resolveFile("A/D").exists()); + } }