User: schaefera
  Date: 02/04/14 19:32:24

  Modified:    src/build Tag: Branch_2_4 build.xml run_tests.xml
  Log:
  Add a new test version of the bank because the old did no use transactions
  and the new uses XDoclet 1.1.2 to generate the DDs and other Java classes.
  Also a marathon test is added. Please specify the jbosstest.duration for
  how long and the test.timeout (which must be longer than the duration) to
  run the test with run_tests.xml, tag marathon-test-and-report.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.34.2.8  +8 -1      jbosstest/src/build/Attic/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/src/build/Attic/build.xml,v
  retrieving revision 1.34.2.7
  retrieving revision 1.34.2.8
  diff -u -r1.34.2.7 -r1.34.2.8
  --- build.xml 29 Dec 2001 10:17:09 -0000      1.34.2.7
  +++ build.xml 15 Apr 2002 02:32:23 -0000      1.34.2.8
  @@ -30,6 +30,7 @@
       <property name="dist.dir" value="dist"/>
       <property name="packages" value="org.*"/>
       <path id="base.path">
  +        <pathelement location="${lib.dir}/ant.jar" />
           <pathelement location="${jboss.dist}/client/jboss-j2ee.jar" />
           <pathelement location="${jboss.dist}/client/jnp-client.jar" />
           <pathelement location="${jboss.dist}/client/connector.jar" />
  @@ -46,6 +47,7 @@
           <pathelement location="${jboss.dist}/lib/ext/mail.jar" />
           <pathelement location="${src.lib.dir}/junit.jar" />
           <pathelement location="${src.lib.dir}/servlet.jar" />
  +        <pathelement location="${src.lib.dir}/xdoclet.jar" />
           <pathelement location="${build.classes.dir}" />
       </path>
       <property name="classpath" refid="base.path"/>
  @@ -71,7 +73,7 @@
              debug="on"
              deprecation="off"
              optimize="off"
  -           excludes="**/ant/taskdefs/**"
  +           excludes="**/ant/taskdefs/**,org/jboss/test/banknew/**"
       />
     </target>
   
  @@ -129,6 +131,7 @@
     -->
     <target name="jar" depends="compile">
       <antcall target="bank-subproject" />
  +    <antcall target="new-bank-subproject" />
       <antcall target="hello-subproject" />
       <antcall target="idgen-subproject" />
       <antcall target="cts-subproject" />
  @@ -155,6 +158,10 @@
       <target name="bank-subproject" depends="prepare">
           <!-- Bank EJB tests -->
           <ant antfile="src/build/subprojects/build-bank.xml" />
  +    </target>
  +    <target name="new-bank-subproject" depends="prepare">
  +        <!-- New Bank EJB tests -->
  +        <ant antfile="src/build/subprojects/build-bank-new.xml" />
       </target>
       <target name="hello-subproject" depends="prepare">
           <!-- Hello EJB tests -->
  
  
  
  1.15.2.13 +61 -2     jbosstest/src/build/Attic/run_tests.xml
  
  Index: run_tests.xml
  ===================================================================
  RCS file: /cvsroot/jboss/jbosstest/src/build/Attic/run_tests.xml,v
  retrieving revision 1.15.2.12
  retrieving revision 1.15.2.13
  diff -u -r1.15.2.12 -r1.15.2.13
  --- run_tests.xml     12 Apr 2002 23:54:10 -0000      1.15.2.12
  +++ run_tests.xml     15 Apr 2002 02:32:23 -0000      1.15.2.13
  @@ -2,7 +2,7 @@
   
   <!-- An ant build file for running the test code against a
   JBoss server dist
  -$Revision: 1.15.2.12 $
  +$Revision: 1.15.2.13 $
   -->
   <project name="JBossUnitTests" default="run-tests" basedir="../../">
   
  @@ -41,6 +41,7 @@
       <property name="build.lib.dir" value="${build.dir}/lib"/>
       <property name="build.deploy.dir" value="${build.dir}/deploy"/>
       <property name="build.classes.dir" value="${build.dir}/classes"/>
  +    <property name="build.generate.dir" value="${build.dir}/generate"/>
       <property name="build.lib.dir" value="${build.dir}/client"/>
       <property name="build.javadocs.dir" value="${build.dir}/docs/api"/>
       <property name="dist.dir" value="dist"/>
  @@ -121,6 +122,25 @@
       </target>
   
     <!-- =================================================================== -->
  +  <!-- Execute the junit tests -->
  +  <!-- =================================================================== -->
  +    <target name="run-marathon-tests" depends="build" if="junit.present">
  +        <delete dir="${test.results.dir}" />
  +        <mkdir dir="${test.results.dir}" />
  +        <antcall target="standard-marathon-tests" />
  +<!--        <antcall target="basic-security-tests" /> -->
  +<!--        <antcall target="client-tests" /> -->
  +
  +        <!-- Check if the security setup steps have been performed -->
  +<!--        <available property="security.configured" 
file="${jboss.home}/bin/SRPVerifierStore.ser" /> -->
  +        <!-- Run security tests seperately due to their need for a
  +        non-default JBoss server dist. If the security-setup task
  +        steps have not been completed these tests will fail.
  +        -->
  +<!--        <antcall target="security-tests" /> -->
  +    </target>
  +
  +  <!-- =================================================================== -->
       <!-- Standard tests that should run successfully against a default JBoss
           server distribution build. This target looks for candidate JUnit tests
           by looking for **/test/Main.java or **/test/Test*.java patterns.
  @@ -237,6 +257,39 @@
     </target>
   -->
     <!-- =================================================================== -->
  +  <!-- AS ToDo: Adjust description
  +        Standard marathon tests that should run successfully against a default JBoss
  +        server distribution build. This target looks for candidate JUnit tests
  +        by looking for **/test/Main.java or **/test/Test*.java patterns.
  +  -->
  +  <!-- =================================================================== -->
  +  <target name="standard-marathon-tests">
  +    <junit dir="${build.classes.dir}"
  +        printsummary="yes"
  +        haltonerror="no"
  +        haltonfailure="no"
  +        fork="true"
  +        timeout="${test.timeout}"
  +      >
  +      <jvmarg value="-Djbosstest.deploy.dir=${build.deploy.dir}" />
  +<!--      <sysproperty key="log4j.configuration" 
value="file:${src.resources}/log4j.properties"/> -->
  +      <sysproperty key="jbosstest.duration" value="${jbosstest.duration}"/>
  +      <classpath>
  +        <path refid="test.classpath" />
  +        <pathelement path="${build.classes.dir}" />
  +<!--        <pathelement location="${src.resources}"/> -->
  +      </classpath>
  +      
  +      <formatter type="xml" usefile="true" />
  +      
  +      <batchtest todir="${test.results.dir}">
  +        <fileset dir="${build.classes.dir}">
  +          <include name="**/*MarathonTestCase.class"/>
  +        </fileset>
  +      </batchtest>
  +    </junit>
  +  </target>
  +  <!-- =================================================================== -->
       <!-- Standard security tests that should run successfully against a default
           JBoss server distribution build.
       -->
  @@ -550,7 +603,13 @@
     <!-- run stress tests, then produce a report from the result file -->
     <!-- =================================================================== -->
     
  -  <target name="stresstest-and-report" depends="run-stress-tests,tests-report"/>
  +  <target name="stress-test-and-report" depends="run-stress-tests,tests-report"/>
  +  
  +  <!-- =================================================================== -->
  +  <!-- run marathon tests, then produce a report from the result file -->
  +  <!-- =================================================================== -->
  +  
  +  <target name="marathon-test-and-report" 
depends="run-marathon-tests,tests-report"/>
     
     <!-- =================================================================== -->
     <!-- run tests, produce a report, then mail it  -->
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to