Return-Path: 
 <ant-dev-return-29861-qmlist-jakarta-archive-ant-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-ant-dev-archive@apache.org
Received: (qmail 60421 invoked from network); 11 Apr 2002 12:58:12 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 11 Apr 2002 12:58:12 -0000
Received: (qmail 20715 invoked by uid 97); 11 Apr 2002 12:58:04 -0000
Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org
Received: (qmail 20663 invoked by uid 97); 11 Apr 2002 12:58:03 -0000
Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:ant-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:ant-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:ant-dev-help@jakarta.apache.org>
List-Post: <mailto:ant-dev@jakarta.apache.org>
List-Id: "Ant Developers List" <ant-dev.jakarta.apache.org>
Reply-To: "Ant Developers List" <ant-dev@jakarta.apache.org>
Delivered-To: mailing list ant-dev@jakarta.apache.org
Received: (qmail 20561 invoked by uid 97); 11 Apr 2002 12:58:03 -0000
Date: 11 Apr 2002 12:58:00 -0000
Message-ID: <20020411125800.28918.qmail@icarus.apache.org>
From: donaldp@apache.org
To: jakarta-ant-myrmidon-cvs@apache.org
Subject: cvs commit: jakarta-ant-myrmidon/aut/src/test/org/apache/aut/vfs/test
 nested.zip test.zip
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

donaldp     02/04/11 05:58:00

  Modified:    aut      build.xml
  Added:       aut/src/test/org/apache/aut/vfs/test nested.zip test.zip
  Log:
  Move testdata into revision control and create a separate ant target that recreates test data. Note that the empty dirs created should be done inside the setUp() of tests
  
  Revision  Changes    Path
  1.5       +36 -8     jakarta-ant-myrmidon/aut/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/aut/build.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.xml	10 Apr 2002 13:31:30 -0000	1.4
  +++ build.xml	11 Apr 2002 12:58:00 -0000	1.5
  @@ -58,8 +58,17 @@
       <target name="main" depends="jar" description="Build the project"/>
       <target name="rebuild" depends="clean,main" description="Rebuild the project"/>
   
  +    <target name="prepare">
  +        <available property="jcifs.present"
  +            classname="jcifs.smb.SmbFile"
  +            classpathref="project.class.path" />
  +        <available property="netcomp.present"
  +            classname="com.oroinc.net.ftp.FTPClient"
  +            classpathref="project.class.path" />
  +    </target>
  +
       <!-- Compiles the source code -->
  -    <target name="compile" description="Compiles the source code">
  +    <target name="compile" depends="prepare" description="Compiles the source code">
   
           <mkdir dir="${build.classes}"/>
   
  @@ -73,6 +82,10 @@
               <classpath refid="project.class.path" />
               <src path="${test.dir}"/>
               <include name="**/*.java"/>
  +            <exclude name="org/apache/aut/vfs/provider/smb/*.java" 
  +                     unless="jcifs.present" />
  +            <exclude name="org/apache/aut/vfs/provider/ftp/*.java" 
  +                     unless="netcomp.present" />
           </javac>
   
           <!-- copy resources to same location as .class files -->
  @@ -145,13 +158,7 @@
           </javadoc>
       </target>
   
  -    <target name="test" depends="compile" description="Perform the unit tests">
  -
  -        <echo message="Performing Unit Tests" />
  -
  -        <mkdir dir="${build.tests}"/>
  -
  -        <property name="test.working.dir" location="${build.dir}/test"/>
  +    <target name="mktestdata" description="Regenerate test data">
   
           <!-- Prepare the VFS tests -->
           <copy todir="${test.working.dir}">
  @@ -169,6 +176,27 @@
           <zip zipfile="${test.vfs.dir}/nested.zip">
               <fileset dir="${test.vfs.dir}" includes="test.zip"/>
           </zip>
  +
  +    </target>
  +
  +    <target name="test" depends="compile" description="Perform the unit tests">
  +
  +        <echo message="Performing Unit Tests" />
  +
  +        <mkdir dir="${build.tests}"/>
  +
  +        <property name="test.working.dir" location="${build.dir}/test"/>
  +
  +        <!-- Prepare the VFS tests -->
  +        <copy todir="${test.working.dir}">
  +            <fileset dir="${test.dir}">
  +                <exclude name="**/*.java"/>
  +            </fileset>
  +        </copy>
  +
  +        <!-- next two lines should be put into suite setUp() -->
  +        <mkdir dir="${test.working.dir}/org/apache/aut/vfs/test/write-tests"/>
  +        <mkdir dir="${test.working.dir}/org/apache/aut/vfs/test/basedir/emptydir"/>
   
           <junit fork="true"
               haltonfailure="${junit.failonerror}"
  
  
  
  1.1                  jakarta-ant-myrmidon/aut/src/test/org/apache/aut/vfs/test/nested.zip
  
  	<<Binary file>>
  
  
  1.1                  jakarta-ant-myrmidon/aut/src/test/org/apache/aut/vfs/test/test.zip
  
  	<<Binary file>>
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>