Browse Source

Demonstrate bug 11732

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274588 13f79535-47bb-0310-9956-ffa450edef68
master
Stefan Bodewig 22 years ago
parent
commit
f8269f189b
2 changed files with 35 additions and 1 deletions
  1. +21
    -0
      src/etc/testcases/taskdefs/move.xml
  2. +14
    -1
      src/testcases/org/apache/tools/ant/taskdefs/MoveTest.java

+ 21
- 0
src/etc/testcases/taskdefs/move.xml View File

@@ -22,9 +22,30 @@
</move> </move>
</target> </target>


<!-- Bugzilla Report 11732 -->
<target name="testDirectoryRemoval">
<mkdir dir="A/B"/>
<mkdir dir="A/C"/>
<mkdir dir="A/D"/>
<touch file="A/B/1"/>
<touch file="A/C/2"/>
<touch file="A/D/3"/>
<mkdir dir="E"/>
<move todir="E" includeemptydirs="true">
<fileset dir="A">
<include name="C"/>
<include name="D"/>
<include name="C/**"/>
<include name="D/**"/>
</fileset>
</move>
</target>

<target name="cleanup"> <target name="cleanup">
<delete file="move.filterset.tmp"/> <delete file="move.filterset.tmp"/>
<delete file="move.filterchain.tmp"/> <delete file="move.filterchain.tmp"/>
<delete dir="A"/>
<delete dir="E"/>
</target> </target>


</project> </project>

+ 14
- 1
src/testcases/org/apache/tools/ant/taskdefs/MoveTest.java View File

@@ -1,7 +1,7 @@
/* /*
* The Apache Software License, Version 1.1 * 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. * reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@@ -96,4 +96,17 @@ public class MoveTest extends BuildFileTest {
assertTrue(tmp.exists()); assertTrue(tmp.exists());
assertTrue(fileUtils.contentEquals(tmp, check)); 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());
}
} }

Loading…
Cancel
Save