You are viewing a plain text version of this content. The canonical link for it is here.
Posted to torque-dev@db.apache.org by mp...@apache.org on 2003/06/28 21:46:03 UTC

cvs commit: db-torque build-test.xml maven.xml

mpoeschl    2003/06/28 12:46:03

  Modified:    .        build-test.xml maven.xml
  Log:
  separate tests for ojb
  
  Revision  Changes    Path
  1.45      +45 -2     db-torque/build-test.xml
  
  Index: build-test.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/build-test.xml,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- build-test.xml	11 May 2003 16:24:04 -0000	1.44
  +++ build-test.xml	28 Jun 2003 19:46:02 -0000	1.45
  @@ -34,6 +34,15 @@
       <property name="templatePath" value="no_templatePath"/>
       <antcall target="test"/>
     </target>
  +  
  +  <target
  +    name="test-ojb"
  +    description="run the testbed using ojb">
  +    <antcall target="test-libs"/>
  +    <antcall target="test-ojb-prepare"/>
  +    <antcall target="test-ojb-generate"/>
  +    <antcall target="test-ojb-compile"/>
  +  </target>
   
     <!-- ============================================================== -->
     <!-- P R E   R U N T I M E   T E S T S                              -->
  @@ -65,7 +74,6 @@
       <antcall target="test-id-table-init-sql"/>
       <antcall target="test-insert-sql"/>
       <antcall target="test-om"/>
  -    <antcall target="test-ojb"/>
     </target>
   
     <!-- ============================================================== -->
  @@ -199,13 +207,48 @@
     </target>
   
     <target
  -    name="test-ojb">
  +    name="test-ojb-prepare">
  +    <delete>
  +      <fileset dir="${torque.distDir}/schema/">
  +        <include name="*"/>
  +      </fileset>
  +    </delete>
  +    <copy
  +      todir="${torque.distDir}/schema"
  +      overwrite="yes">
  +      <fileset dir="src/ojbtest">
  +        <include name="**/*.xml"/>
  +      </fileset>
  +    </copy>
  +    <antcall target="test-create-db"/>
  +    <antcall target="test-sql"/>
  +    <antcall target="test-insert-sql"/>
  +  </target>
  +
  +  <target
  +    name="test-ojb-generate">
       <ant
         dir="${torque.buildFileDir}"
         antfile="${torque.buildFile}"
         target="ojb">
       </ant>
     </target>
  +  
  +  <target
  +    name="test-ojb-compile">
  +    <mkdir dir="${torque.distDir}/bin/ojb"/>
  +
  +    <javac
  +      debug="${torque.compile.debug}"
  +      deprecation="${torque.compile.deprecation}"
  +      destdir="${torque.distDir}/bin/ojb"
  +      optimize="${torque.compile.optimize}"
  +      srcdir="${torque.distDir}/src/ojb">
  +      <classpath refid="classpath"/>
  +    </javac>
  +    
  +  </target>
  +  
   
     <!-- ============================================================== -->
     <!-- R U N T I M E  T E S T S                                       -->
  
  
  
  1.19      +10 -0     db-torque/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/maven.xml,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- maven.xml	11 May 2003 16:21:31 -0000	1.18
  +++ maven.xml	28 Jun 2003 19:46:02 -0000	1.19
  @@ -104,6 +104,16 @@
     </goal>
   
     <goal
  +    name="runtime:test-ojb"
  +    prereqs="runtime:prepare"
  +    description="runtime tests for ojb tasksusing (set torque.testProfile in your build.properties)">
  +
  +    <ant antfile="build-test.xml"
  +         target="test-ojb"
  +         inheritAll="false"/>
  +  </goal>
  +
  +  <goal
       name="runtime:prepare"
       prereqs="java:jar">