Actually, the test for 18886 was supposed to work as is, this is a better test

git-svn-id: https://svn.apache.org/repos/asf/ant/core/trunk@274591 13f79535-47bb-0310-9956-ffa450edef68

src/etc/testcases/taskdefs/move.xml

@@ -44,7 +44,16 @@
   <!-- Bugzilla Report 18886 -->
   <target name="testDirectoryRetaining">
     <mkdir dir="A"/>
+    <touch file="A/1"/>
     <mkdir dir="E"/>
+    <move todir="E" includeemptydirs="true">
+      <fileset dir="A" includes="1"/>
+    </move>
+  </target>
+
+  <target name="testCompleteDirectoryMove">
+    <mkdir dir="A"/>
+    <touch file="A/1"/>
     <move todir="E">
       <fileset dir="A"/>
     </move>

src/testcases/org/apache/tools/ant/taskdefs/MoveTest.java

@@ -114,6 +114,16 @@ public class MoveTest extends BuildFileTest {
     public void testDirectoryRetaining() throws IOException {
         executeTarget("testDirectoryRetaining");
         assertTrue(getProject().resolveFile("E").exists());
+        assertTrue(getProject().resolveFile("E/1").exists());
+        assertTrue(!getProject().resolveFile("A/1").exists());
         assertTrue(getProject().resolveFile("A").exists());
     }
+
+    public void testCompleteDirectoryMove() throws IOException {
+        executeTarget("testCompleteDirectoryMove");
+        assertTrue(getProject().resolveFile("E").exists());
+        assertTrue(getProject().resolveFile("E/1").exists());
+        assertTrue(!getProject().resolveFile("A/1").exists());
+        assertTrue(!getProject().resolveFile("A").exists());
+    }
 }