cvs commit: ant/src/testcases/org/apache/tools/ant/taskdefs MoveTest.java

[bodewig]

bodewig     2003/05/19 07:27:43

  Modified:    src/etc/testcases/taskdefs move.xml
               src/testcases/org/apache/tools/ant/taskdefs MoveTest.java
  Log:
  Actually, the test for 18886 was supposed to work as is, this is a better test
  
  Revision  Changes    Path
  1.5       +9 -0      ant/src/etc/testcases/taskdefs/move.xml
  
  Index: move.xml
  ===================================================================
  RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/move.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- move.xml  19 May 2003 14:11:24 -0000      1.4
  +++ move.xml  19 May 2003 14:27:43 -0000      1.5
  @@ -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>
  
  
  
  1.8       +10 -0     
ant/src/testcases/org/apache/tools/ant/taskdefs/MoveTest.java
  
  Index: MoveTest.java
  ===================================================================
  RCS file: 
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/MoveTest.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- MoveTest.java     19 May 2003 14:11:24 -0000      1.7
  +++ MoveTest.java     19 May 2003 14:27:43 -0000      1.8
  @@ -114,6 +114,16 @@
       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());
       }
   }