From f8269f189bdcbfa092711464caaf2f9a17f14053 Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Mon, 19 May 2003 14:05:23 +0000
Subject: [PATCH] Demonstrate bug 11732

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274588 13f79535-47bb-0310-9956-ffa450edef68
---
 src/etc/testcases/taskdefs/move.xml           | 21 +++++++++++++++++++
 .../apache/tools/ant/taskdefs/MoveTest.java   | 15 ++++++++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

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 @@
     </move>
   </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"> 
     <delete file="move.filterset.tmp"/>
     <delete file="move.filterchain.tmp"/>
+    <delete dir="A"/>
+    <delete dir="E"/>
   </target>
 
 </project>
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());
+    }
 }