[Remoterengine-commits] r140 - pkg/RemoteREngine.test/inst/java_src

[noreply at r-forge.r-project.org]

Author: romain
Date: 2009-09-17 11:29:41 +0200 (Thu, 17 Sep 2009)
New Revision: 140

Modified:
   pkg/RemoteREngine.test/inst/java_src/build.properties
   pkg/RemoteREngine.test/inst/java_src/build.xml
Log:
updated build for test package

Modified: pkg/RemoteREngine.test/inst/java_src/build.properties
===================================================================
--- pkg/RemoteREngine.test/inst/java_src/build.properties	2009-09-17 09:29:17 UTC (rev 139)
+++ pkg/RemoteREngine.test/inst/java_src/build.properties	2009-09-17 09:29:41 UTC (rev 140)
@@ -12,3 +12,9 @@
 
 testng.jar=lib/testng-5.10-jdk15.jar
 
+# testng.home=D:\JavaLibraries\testng-5.10
+testng.build=build/test
+testng.reports=build/testng_reports
+
+jdk15.testing.jar=locallib/testng-5.10-jdk15.jar
+

Modified: pkg/RemoteREngine.test/inst/java_src/build.xml
===================================================================
--- pkg/RemoteREngine.test/inst/java_src/build.xml	2009-09-17 09:29:17 UTC (rev 139)
+++ pkg/RemoteREngine.test/inst/java_src/build.xml	2009-09-17 09:29:41 UTC (rev 140)
@@ -2,7 +2,8 @@
 <project default="all">
 
 	<property file="build.properties"/>
-	
+	<taskdef resource="testngtasks" classpath="${jdk15.testing.jar}" />
+  
 	<r-set property="client.jar">
 		system.file( "java", "RemoteREngine-client.jar", 
 			package = "RemoteREngine" )
@@ -40,6 +41,65 @@
 		</jar>
 	</target>
 	
+	<path id="compiletests.classpath">
+		<pathelement location="${jdk15.testing.jar}" />
+		<pathelement location="${common.dir}" />
+		<pathelement location="lib/REngine.jar" />
+	</path>
+	
+	<target name="testng-compile" depends="client,annotation,stubs">
+		<javac
+			destdir="${testng.build}"  
+			includeJavaRuntime="yes"
+			debug="${compiler.debug}"
+  			debuglevel="${compiler.debuglevel}"
+  			optimize="${compiler.optimize}"
+  			deprecation="${compiler.deprecation}"
+  			verbose="${compiler.verbose}"
+  			nowarn="${compiler.nowarn}"
+  			target="${compiler.target}"
+  			source="${compiler.source}">
+  
+			<src path="test" />
+			<src path="src/client" />
+			<include name="**/*.java"/>
+			<exclude name="**/test/*"/>
+			<classpath refid="compiletests.classpath" />
+		</javac>
+	</target>
+
+	<path id="testng.classpath">
+		<dirset dir="${build.dir}">
+			<include name="*" />
+			<exclude name="testng_reports"/>
+		</dirset>
+		<pathelement location="lib/REngine.jar" />
+	</path>
+	<target name="setup.rmicodebase" description="Build codebase for TestNG tests to use class files" >
+		<!-- Convert the classpath into a URL based path -->
+	    <pathconvert targetos="unix" property="rmicodebase" refid="testng.classpath" >
+			<map from="C:" to="file:/c:" />
+	    	<map from="D:" to="file:/d:" />
+			<map from="E:" to="file:/e:" />
+			<map from="F:" to="file:/f:" />
+			<map from="G:" to="file:/g:" />
+	    </pathconvert>
+	</target>
+	<!-- TODO Create a target to start the test server -->
+	<target name="runtests" depends="testng-compile,setup.rmicodebase" description="Run TestNG Unit Tests">
+		<testng 
+			classpathref="testng.classpath"	
+			outputDir="${testng.reports}"
+			verbose="2"
+			haltonfailure="true">
+			<jvmarg value="-Djava.security.policy=../policy/server.policy" />
+			<jvmarg value="-Djava.rmi.server.codebase=${rmicodebase}" />
+			<classfileset dir="${testng.build}" includes="**/*.class" />
+		</testng>
+	</target>
+	
+	
+	
 	<target name="all" depends="compile,build" />
 	
 </project>