[MOBY-guts] biomoby commit

[Martin Senger]

senger
Thu Feb 28 00:21:49 EST 2008
Update of /home/repository/moby/moby-live/Java/xmls
In directory dev.open-bio.org:/tmp/cvs-serv20124/xmls

Modified Files:
	junit.xml mosesBuild.xml project.pom 
Log Message:
* the jMoby XML message parser can accept now more specialized types of members than the ones its parent was registered with
* added junit tests for the parser

moby-live/Java/xmls junit.xml,1.1,1.2 mosesBuild.xml,1.3,1.4 project.pom,1.4,1.5
===================================================================
RCS file: /home/repository/moby/moby-live/Java/xmls/junit.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- /home/repository/moby/moby-live/Java/xmls/junit.xml	2008/02/14 06:13:37	1.1
+++ /home/repository/moby/moby-live/Java/xmls/junit.xml	2008/02/28 05:21:48	1.2
@@ -2,19 +2,20 @@
 <!-- $Id$ -->
 <!-- ====================================================== -->
 
-<!-- ====================================================== -->
-<!--                                                        -->
-<!-- junit testing...                                       -->
-<!--                                                        -->
-<!-- ====================================================== -->
-
 <!-- ================================================================== -->
 <!-- JUnit tests                                                        -->
 <!-- ================================================================== -->
+
+<property name="test.report.dir" location="${basedir}/testout"/>
+<property name="junit.resources" location="${src.root}/test/junit-resources"/>
+
+<mkdir dir="${test.report.dir}"/>
   
-<!-- The main entry point to junit testing. If tests are successful,
-     it does nothing. It only reports when a failure occured. -->
-<target name="test-junit" if="test.failure" depends="do-junit"
+<!-- ================================================================== -->
+<!-- The main entry point to junit testing. If tests are successful,    -->
+<!-- it does nothing. It only reports when a failure occured.           -->
+<!-- ================================================================== -->
+<target name="test-junit" if="test.failure" depends="do-junit,do-junit-2"
   description="Run the junit test cases">
   <fail message="There were test failures." />
 </target>
@@ -33,11 +34,8 @@
 </target>
   
 <!-- this is the core: here is the testing done -->
-<target name="do-junit" if="junit.is.present" depends="junit-present,compile">
-  
-  <property name="test.report.dir" location="${basedir}/testout"/>
-  <mkdir dir="${test.report.dir}"/>
-  
+<target name="do-junit" if="junit.is.present" depends="junit-present">
+
   <junit
     printsummary="yes"
     fork="yes"
@@ -72,3 +70,62 @@
   
 </target>
   
+
+<!-- this is the core: here is the testing done -->
+<!-- (put here only relatively fast tests)      -->
+<target name="do-junit-2" if="junit.is.present" depends="junit-present,compile-tests">
+
+  <junit
+    printsummary="yes"
+    showoutput="yes"
+    fork="yes"
+    failureproperty="test.failure">
+    <classpath>
+      <path refid="build.classpath"/>
+      <path refid="dependency.classpath"/>
+      <pathelement path="${classes.datatypes}"/>
+      <pathelement path="${build.test}"/>
+      <pathelement path="${junit.resources}"/>
+    </classpath>
+    <jvmarg value="-Dlog4j.configuration=file:${log4j.configuration}"/>
+    <formatter type="plain"/>
+    <batchtest todir="${test.report.dir}">
+      <fileset dir="${build.test}" includes="**/*Test.*" />
+    </batchtest>
+  </junit>
+
+</target>
+  
+
+<!-- ================================================================== -->
+<!-- Compile JUnit tests                                                -->
+<!-- ================================================================== -->
+<target name="compile-tests" if="junit.is.present" depends="compile,junit-present">
+  
+  <!-- compilation options -->    
+  <property name="compile.test.debug"       value="${compile.debugtrue}" />
+  <property name="compile.test.verbose"     value="${compile.verbosefalse}" />
+  <property name="compile.test.deprecation" value="${compile.deprecationfalse}" />
+  <property name="compile.test.optimize"    value="${compile.optimizefalse}" />
+  <property name="compile.test.warnings"    value="${compile.warningsfalse}" />
+    
+  <condition property="xlint.test.param" value="-Xlint:unchecked" else="-Xlint:none">
+    <istrue value="${compile.test.warnings}"/>
+  </condition>
+
+  <javac
+    srcdir="${src.test}"
+    destdir="${build.test}"
+    verbose="${compile.test.verbose}"
+    debug="${compile.test.debug}"
+    debuglevel="lines,vars,source"
+    deprecation="${compile.test.deprecation}"
+    optimize="${compile.test.optimize}"
+    excludes="${project.excludes}">
+    <classpath refid="build.classpath"/>
+    <classpath refid="dependency.classpath"/>
+    <compilerarg value="${xlint.test.param}"/>
+  </javac>
+
+</target>
+

===================================================================
RCS file: /home/repository/moby/moby-live/Java/xmls/mosesBuild.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- /home/repository/moby/moby-live/Java/xmls/mosesBuild.xml	2008/02/20 08:05:40	1.3
+++ /home/repository/moby/moby-live/Java/xmls/mosesBuild.xml	2008/02/28 05:21:49	1.4
@@ -95,6 +95,11 @@
     <istrue value="${moses.nographs}"/>
   </condition>
   
+  <property name="moses.olde" value="false"/>
+  <condition property="real.moses.olde" value="-olde" else="">
+    <istrue value="${moses.olde}"/>
+  </condition>
+  
   <condition property="filter.services">
     <or>
       <isset property="moses.service"/>
@@ -135,6 +140,7 @@
     <arg value="${real.moses.quiet}"/>
     <arg value="${real.moses.nographs}"/>
     <arg value="${real.moses.nogener}"/>
+    <arg value="${real.moses.olde}"/>
     <arg value="-e"/>
     <arg value="${default.endpoint}"/>
     <arg value="-uri"/>

===================================================================
RCS file: /home/repository/moby/moby-live/Java/xmls/project.pom,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- /home/repository/moby/moby-live/Java/xmls/project.pom	2008/02/14 08:32:58	1.4
+++ /home/repository/moby/moby-live/Java/xmls/project.pom	2008/02/28 05:21:49	1.5
@@ -277,7 +277,8 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <!--      <version>3.8.1</version> -->
+      <version>4.4</version>
       <scope>test</scope>
     </dependency>