[jboss-cvs] JBossCache ...

[Galder Zamarreno]

  User: gzamarreno
  Date: 07/04/19 17:51:20

  Modified:    JBossCache  build.xml
  Log:
  [JBCACHE-964] unit tests for transforming cache loaders now run from build.xml and are also executed as part of the cc tests
  
  Revision  Changes    Path
  1.198     +65 -6     JBossCache/build.xml
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: build.xml
  ===================================================================
  RCS file: /cvsroot/jboss/JBossCache/build.xml,v
  retrieving revision 1.197
  retrieving revision 1.198
  diff -u -b -r1.197 -r1.198
  --- build.xml	12 Apr 2007 17:25:12 -0000	1.197
  +++ build.xml	19 Apr 2007 21:51:20 -0000	1.198
  @@ -1,6 +1,6 @@
   <?xml version="1.0" encoding="UTF-8"?>
   
  -<!-- $Id: build.xml,v 1.197 2007/04/12 17:25:12 jgreene Exp $ -->
  +<!-- $Id: build.xml,v 1.198 2007/04/19 21:51:20 gzamarreno Exp $ -->
   
   <project default="compile" name="JBossCache">
   
  @@ -59,6 +59,9 @@
      <property name="migration.examples.dir" value="${migration.dir}/examples"/>
      <property name="migration.jar.name" value="jbosscache-cacheloader-migration.jar"/>
      <property name="migration.manifest.file" value="${dist.lib}/migration.default.mf"/>
  +   <property name="migration.tests.dir" value="${migration.dir}/tests"/>
  +   <property name="cache.db.dir" value="${root.dir}/jbossdb" />
  +   <property name="cache.db.1x.dir" value="${cache.db.dir}-1x" />
      <!-- -->
      <condition property="ENABLE_COMPAT_TESTS">
         <or>
  @@ -129,6 +132,9 @@
      </path>
   
      <path id="migration.library.classpath">
  +      <fileset dir="${retro.lib.dir}">
  +         <include name="jboss-logging-spi.jar"/>
  +      </fileset>
         <fileset dir="${migration.lib.dir}">
            <include name="*.jar"/>
         </fileset>
  @@ -152,6 +158,12 @@
         </fileset>
      </path>
   
  +   <path id="migration.output.classpath">
  +      <pathelement location="${migration.compile.dir}"/>
  +      <pathelement location="${migration.compiletest.dir}"/>
  +      <pathelement location="${output.etc.dir}"/>
  +   </path>
  +
      <path id="previous.version.classpath">
         <pathelement location="${output.etc.dir}"/>
         <pathelement location="${compiletest.dir}"/>
  @@ -338,7 +350,7 @@
         <mkdir dir="${migration.compile.dir}"/>
         <mkdir dir="${migration.compiletest.dir}"/>
   
  -      <!-- compile JBossCache Java code -->
  +      <!-- compile cache loader migration Java code -->
         <javac destdir="${migration.compile.dir}"
                debug="on"
                deprecation="${deprecation}"
  @@ -351,6 +363,24 @@
            <classpath refid="migration.classpath"/>
         </javac>
   
  +      <!-- compile cache loader migration test classes -->
  +      <javac destdir="${migration.compiletest.dir}"
  +             debug="on"
  +             deprecation="${deprecation}"
  +             optimize="off"
  +             includes="**/*.java"
  +             target="1.5"
  +             source="1.5"
  +             failonerror="true">
  +         <src path="${migration.tests.dir}"/>
  +         <classpath refid="migration.classpath"/>
  +         <classpath refid="library.classpath"/>
  +         <classpath refid="migration.library.classpath"/>
  +         <classpath path="${compile.dir}"/>
  +         <classpath path="${compiletest.dir}"/>
  +         <classpath path="${migration.compile.dir}"/>         
  +      </javac>
  +
      </target>
   
      <!-- ================================================================== -->
  @@ -527,7 +557,10 @@
         <delete dir="${build.reports}"/>
         <delete dir="${dist.dir}"/>
         <delete dir="${tmp.dir}"/>
  -      <delete dir="${root.dir}/jbossdb"/>
  +      <delete dir="${migration.output.dir}"/>
  +      <delete dir="${cache.db.dir}"/>
  +      <delete dir="${cache.db.1x.dir}"/>
  +
         <delete>
            <fileset dir="${basedir}" defaultexcludes="no">
               <include name="**/*~"/>
  @@ -539,6 +572,7 @@
      <target name="clean-tests">
         <delete dir="${output.dir}/tests-classes"/>
         <delete dir="${output.dir}/tests-classes-50"/>
  +      <delete dir="${migration.compiletest.dir}"/>      
      </target>
   
   
  @@ -841,6 +875,31 @@
         </junit>
      </target>
   
  +   <target name="functionaltests-migration" depends="compile-cache,test-jar,unittests-init"
  +           description="Runs cache loader functional tests">
  +      <property name="jgroups.stack" value="udp"/>
  +      <echo>Running functional tests using ${jgroups.stack} jgroups stack</echo>
  +      <junit printsummary="yes" timeout="${junit.timeout}" fork="yes" maxmemory="512m">
  +         <classpath refid="library.classpath"/>
  +         <classpath refid="output.classpath"/>
  +         <classpath refid="migration.library.classpath"/>
  +         <classpath refid="migration.output.classpath"/>
  +         <jvmarg value="-Dbind.address=${bind.address}"/>
  +         <jvmarg value="-Djgroups.stack=${jgroups.stack}"/>
  +         <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
  +         <jvmarg value="-Dtest.jar.dir=${output.dir}"/>
  +         <jvmarg value="-Dlib.dir=${lib.dir}"/>
  +         <formatter classname="org.jboss.cache.util.XMLUnitTestFormatter" usefile="true"
  +                    extension="-${jgroups.stack}.xml"/>
  +         <batchtest todir="${build.reports}">
  +            <fileset dir="${migration.tests.dir}">
  +               <include name="**/*Test.*"/>
  +               <patternset refid="junit.excludes"/>
  +            </fileset>
  +         </batchtest>
  +      </junit>
  +   </target>
  +
      <!--
      This is new target since 1.2.4. Since the old way using SystemClassLoader ie error prone, it has been replcaed in
      JBossAop 1.3.1 for the new GeneratedInstrumentedClassLoader. But for this to work, we will need this target
  @@ -920,7 +979,7 @@
      -->
   
      <target name="all-functionaltests"
  -           depends="functionaltests, functionalPojoCacheTests"
  +           depends="functionaltests, functionalPojoCacheTests, functionaltests-migration"
              description="Runs all functional tests (including AOP tests)">
      </target>
   
  @@ -1100,7 +1159,7 @@
      </target>
   
      <target name="unittests"
  -           depends="functionaltests, perftests, stresstests"
  +           depends="functionaltests, functionaltests-migration, perftests, stresstests"
              description="Run all non-AOP unit tests (functional, perf, stress)"/>
   
      <target name="all-unittests"