bodewig     2003/10/10 03:33:42

  Modified:    src/etc/testcases/taskdefs war.xml
               src/testcases/org/apache/tools/ant/taskdefs WarTest.java
  Log:
  Testcase for PR 23639
  
  Revision  Changes    Path
  1.4       +2 -1      ant/src/etc/testcases/taskdefs/war.xml
  
  Index: war.xml
  ===================================================================
  RCS file: /home/cvs/ant/src/etc/testcases/taskdefs/war.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- war.xml   22 Apr 2003 23:16:30 -0000      1.3
  +++ war.xml   10 Oct 2003 10:33:42 -0000      1.4
  @@ -12,10 +12,11 @@
     </target>
     
     <target name="testlibrefs" depends="setup">
  -    <fileset id="test" dir="." includes="foobar"/>
  +    <fileset id="test" dir="." includes="war.xml"/>
       <war webxml="war.xml" destfile="${working.dir}/test.war">
         <lib refid="test"/>
       </war>
  +    <unzip src="${working.dir}/test.war" dest="${working.dir}"/>
     </target>
     
     <target name="clean">
  
  
  
  1.4       +5 -1      
ant/src/testcases/org/apache/tools/ant/taskdefs/WarTest.java
  
  Index: WarTest.java
  ===================================================================
  RCS file: 
/home/cvs/ant/src/testcases/org/apache/tools/ant/taskdefs/WarTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- WarTest.java      10 Feb 2003 14:14:45 -0000      1.3
  +++ WarTest.java      10 Oct 2003 10:33:42 -0000      1.4
  @@ -1,7 +1,7 @@
   /*
    * The Apache Software License, Version 1.1
    *
  - * Copyright (c) 2002 The Apache Software Foundation.  All rights
  + * Copyright (c) 2002-2003 The Apache Software Foundation.  All rights
    * reserved.
    *
    * Redistribution and use in source and binary forms, with or without
  @@ -54,6 +54,8 @@
   
   package org.apache.tools.ant.taskdefs;
   
  +import java.io.File;
  +
   import org.apache.tools.ant.BuildFileTest;
   
   /**
  @@ -82,5 +84,7 @@
        */
       public void testLibRefs() {
           executeTarget("testlibrefs");
  +        File f = getProject().resolveFile("working/WEB-INF/lib/war.xml");
  +        assertTrue("File has been put into lib", f.exists());
       }
   }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to