[Mulgara-svn] r1993 - in trunk: . src/jar/querylang src/jar/resolver

[pag at mulgara.org]

Author: pag
Date: 2011-07-15 03:14:44 +0000 (Fri, 15 Jul 2011)
New Revision: 1993

Modified:
   trunk/common.xml
   trunk/src/jar/querylang/build.xml
   trunk/src/jar/resolver/build.xml
Log:
Added extra targets to assist in debugging by running tests against an already running store

Modified: trunk/common.xml
===================================================================
--- trunk/common.xml	2011-02-03 20:45:35 UTC (rev 1992)
+++ trunk/common.xml	2011-07-15 03:14:44 UTC (rev 1993)
@@ -363,6 +363,59 @@
 
   </target>
 
+  <target name="standalone-test-debug"
+          depends="uri, dtd-jar, host.name, dist"
+          description="run regression tests requiring a standalone instance">
+
+    <copy file="${conf.dir}/log4j-template.xml"
+          tofile="${basedir}/log4j-conf.xml"/>
+
+    <mkdir dir="${junit.results.tmpdir}"/>
+
+    <!-- stop and start the server -->
+    <junit fork="yes" haltonfailure="no" printsummary="on"
+           jvm="${java.home}/bin/java" dir="${basedir}">
+
+      <jvmarg value="${arch.bits}"/>
+      <jvmarg value="-ea"/>
+      <jvmarg value="${jvm.args}"/>
+
+      <sysproperty key="java.io.tmpdir" value="${tmp.dir}"/>
+      <sysproperty key="test.dir" value="${test.dir}"/>
+      <sysproperty key="admin" value=""/>
+      <sysproperty key="itql.command.log" value="${tmp.dir}/querylang.log"/>
+      <sysproperty key="org.mulgara.xml.ResourceDocumentBuilderFactory"
+                   value="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"/>
+      <sysproperty key="java.naming.factory.initial"
+                   value="com.sun.jndi.rmi.registry.RegistryContextFactory"/>
+      <sysproperty key="java.naming.provider.url" value="rmi://localhost"/>
+      <sysproperty key="java.rmi.server.codebase"
+                   value="${bin.uri}/${rmi.base.jar}"/>
+      <sysproperty key="java.security.manager" value=""/>
+      <sysproperty key="java.security.policy"
+                   value="${basedir}/conf/mulgara-test.policy"/>
+      <sysproperty key="host.name" value="${host.name}"/>
+
+      <!-- The cvs.root property allows tests to find CVS'ed test data -->
+      <sysproperty key="cvs.root" value="${basedir}"/>
+      <sysproperty key="mulgara.jar" value="${mulgara.jar}"/>
+      <sysproperty key="log4j.configuration" value="${baseuri}/log4j-conf.xml"/>
+      <sysproperty key="basedir" value="${basedir}"/>
+      <sysproperty key="org.mulgara.test" value="${org.mulgara.test}"/>
+
+      <classpath>
+        <fileset dir="${dist.dir}" includes="${mulgara.jar}"/>
+      </classpath>
+
+      <formatter type="xml"/>
+
+      <batchtest todir="${junit.results.tmpdir}">
+        <fileset dir="${dir}/java" includes="**/*StandaloneTest.java"/>
+      </batchtest>
+    </junit>
+
+  </target>
+
   <!-- =================================================================== -->
   <!-- Run JUnit load tests on a JAR component                             -->
   <!--                                                                     -->

Modified: trunk/src/jar/querylang/build.xml
===================================================================
--- trunk/src/jar/querylang/build.xml	2011-02-03 20:45:35 UTC (rev 1992)
+++ trunk/src/jar/querylang/build.xml	2011-07-15 03:14:44 UTC (rev 1993)
@@ -183,6 +183,19 @@
     <antcall target="stop"/>
   </target>
 
+  <target name="querylang-test2"
+          depends="querylang-jar, test-data"
+          description="Carries out unit testing for this querylang">
+
+    <antcall target="component-test">
+
+      <param name="classpath.id" value="querylang-test-classpath"/>
+      <param name="dir" value="${querylang.src.dir}"/>
+      <param name="jar" value="${querylang.jar}"/>
+    </antcall>
+
+  </target>
+
   <target name="querylang-javadoc"
           depends="querylang-jar"
           description="Creates the javadoc for this querylang">

Modified: trunk/src/jar/resolver/build.xml
===================================================================
--- trunk/src/jar/resolver/build.xml	2011-02-03 20:45:35 UTC (rev 1992)
+++ trunk/src/jar/resolver/build.xml	2011-07-15 03:14:44 UTC (rev 1993)
@@ -147,6 +147,19 @@
     </antcall>
   </target>
 
+  <target name="resolver-test-debug"
+          depends="jrdf-jar, store-nodepool-memory-jar, 
+                   resolver-jar, resolver-memory-jar, resolver-xsd-jar,
+                   store-nodepool-xa-jar, store-stringpool-xa-jar, resolver-store-jar,
+                   resolver-url-jar, store-stringpool-memory-jar, tuples-hybrid-jar,
+                   util-jar, util-xa-jar, driver-jar">
+    <antcall target="standalone-test-debug">
+      <param name="classpath.id" value="resolver-test-classpath"/>
+      <param name="dir" value="${resolver.src.dir}"/>
+      <param name="jar" value="${resolver.jar}"/>
+    </antcall>
+  </target>
+
   <target name="resolver-javadoc"
           depends="resolver-jar"
           description="Creates the javadoc for this resolver">