river-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ju...@apache.org
Subject svn commit: r755895 - in /incubator/river/jtsk/trunk: integrationtest.xml integrationtests/integrationtest.xml
Date Thu, 19 Mar 2009 10:23:49 GMT
Author: jukka
Date: Thu Mar 19 10:23:48 2009
New Revision: 755895

URL: http://svn.apache.org/viewvc?rev=755895&view=rev
Log:
RIVER-301: Move the tests into the JUnit framework inside the main source project

New integrationtest.xml build file contributed by Tom Hobbs.

Added:
    incubator/river/jtsk/trunk/integrationtest.xml
      - copied, changed from r755890, incubator/river/jtsk/trunk/integrationtests/integrationtest.xml
Removed:
    incubator/river/jtsk/trunk/integrationtests/integrationtest.xml

Copied: incubator/river/jtsk/trunk/integrationtest.xml (from r755890, incubator/river/jtsk/trunk/integrationtests/integrationtest.xml)
URL: http://svn.apache.org/viewvc/incubator/river/jtsk/trunk/integrationtest.xml?p2=incubator/river/jtsk/trunk/integrationtest.xml&p1=incubator/river/jtsk/trunk/integrationtests/integrationtest.xml&r1=755890&r2=755895&rev=755895&view=diff
==============================================================================
--- incubator/river/jtsk/trunk/integrationtests/integrationtest.xml (original)
+++ incubator/river/jtsk/trunk/integrationtest.xml Thu Mar 19 10:23:48 2009
@@ -25,53 +25,119 @@
      taken from the Jini Test harness.
 -->
 
-<project name="RiverIntegrationTests" default="all" basedir=".">
+<project name="RiverIntegrationTests" default="all.integrationtests" basedir=".">
 
-    <description>Builds and executes the River test harness</description>
-    
-    <import file="../build_common.xml"/>    
-    
-    <!-- set the properties -->    
-    <property name="com.sun.jini.test.home" value="./qa/src"/>
-    <property name="harness.build" value="${com.sun.jini.test.home}/build"/>    
-    <property name="harness.lib" value="${com.sun.jini.test.home}/lib"/>    
-    <property name="river.lib" value="../lib"/>
-    
-    <path id="river.classpath">
-        <fileset dir="${river.lib}" includes="**/*.jar"/>
-    </path>
-              
-    <target name="all" depends="clean.qa, build.qa"/>              
-              
-    <!-- clean old directories -->
-    <target name="clean.qa">
-        <delete dir="${harness.build}"/>
-        <mkdir dir="${harness.build}"/>
-        
-        <delete dir="${harness.lib}"/>
-        <mkdir dir="${harness.lib}"/>
-    </target>
-    
-    <!-- build the required jars -->
-    <target name="build.qa" depends="clean.qa">
-        <javac srcdir="${com.sun.jini.test.home}"
-               destdir="${harness.build}"
-               source="1.4"
-               classpathref="river.classpath"/>
-               
-        <jar destfile="${harness.lib}/jiniharness.jar">
-            <fileset dir="${harness.build}"
-                     includes="**/*.class"/>
-            <fileset dir="${com.sun.jini.test.home}"
-                     includes="**/*.class"/>                   
-        </jar>
-    </target>
-    
-    <!-- tasks to execute the test by category -->
-    
-    <!-- examples of tasks to execute specific-named tests -->
-    
-    
-    
-    
+	<import file="build.xml"/>
+	
+	<description>Builds and executes the River test harness</description>
+
+	<property name="distribution.classes"    		value="./classes" />
+	<property name="distribution.lib" 				value="./lib" />
+	<property name="distribution.lib.dl" 			value="./lib-dl" />
+	<property name="distribution.lib.ext" 			value="./lib-ext" />
+	<property name="qatests.home" 					value="./integrationtests/qa" />
+	<property name="qatests.src" 					value="${qatests.home}/src" />
+	<property name="qatests.lib" 					value="${qatests.home}/lib" />
+	<property name="qatests.classes" 				value="${qatests.home}/classes" />
+	<property name="qatests.tmp.jiniqa2_1" 			value="/tmp/jiniqa2_1" />
+	<property name="qatests.tmp.jiniqa2_1_har" 		value="/tmp/jiniqa2_1_har" />
+	<property name="qatests.tmp.jiniqa2_1_harness" 	value="/tmp/jiniqa2_1_harness" />
+	<property name="qatests.tmp.jiniqa2_1_tests" 	value="/tmp/jiniqa2_1_tests" />
+	<property name="qatests.tmp.jiniqa2_1_src" 		value="/tmp/jiniqa2_1_src" />
+	<property name="qatests.tmp.jiniqa2_1_jtreg" 	value="/tmp/jiniqa2_1_jtreg" />
+
+	<path id="river.classpath">
+		<fileset dir="${distribution.lib}"     includes="**/*.jar" />
+		<fileset dir="${distribution.lib.dl}"  includes="**/*.jar" />
+		<fileset dir="${distribution.lib.ext}" includes="**/*.jar" />
+	</path>
+		
+	<target name="make.release">
+		<antcall target="clean"/>
+		<antcall target="build.release"/>
+		<antcall target="install.policy"/>
+	</target>
+	
+	<target name="install.merged.policy.provider">
+	<!--
+	cp $WORKSPACE/qatests/trunk/source/vob/qa/lib/mergedpolicyprovider.jar $JAVA_HOME/jre/lib/ext
+	-->
+	</target>
+	
+	<!-- clean old directories -->
+	<target name="clean.qa">
+		<delete dir="${qatests.classes}" />
+		<mkdir dir="${qatests.classes}" />
+
+		<delete dir="${qatests.lib}" />
+		<mkdir dir="${qatests.lib}" />
+	</target>
+
+	<!-- build the required jars -->
+	<target name="build.qa" depends="clean.qa">
+		<javac 	srcdir="${qatests.src}" 
+			   	destdir="${qatests.classes}" 
+			   	source="1.4" 
+				classpathref="river.classpath" 
+				deprecation="yes" 
+				debuglevel="lines,source,vars" />
+		
+	<!-- 
+    	following files are hardcoded in because;
+    	
+    	1) on my default install they are the only ones that the original make file builds
+    	2) can't make head nor tail of the make file to find out how it builds the list
+    	
+    	also, not sure that the generated files are correct, some file sizes are different when
+    	generated from ant rather than the original make file
+    	-->
+		<rmic 	base="${qatests.classes}" 
+				iiop="true" 
+				classpath="${qatests.classes}" 
+				classname="com.sun.jini.test.spec.iiop.util.TestRemoteObject" 
+				compiler="sun" 
+				stubversion="1.2" />
+		<rmic 	base="${qatests.classes}" 
+				iiop="true" 
+				classpath="${qatests.classes}" 
+				classname="com.sun.jini.test.spec.jrmp.util.TestRemoteObject" 
+				compiler="sun" 
+				stubversion="1.2" />
+
+		<jar destfile="${qatests.lib}/jiniharness.jar">
+			<fileset dir="${qatests.classes}" 
+					 includes="**/*.class" />
+			<fileset dir="${qatests.src}" 
+					 excludes="**/*.java" />
+			<fileset  dir="${distribution.classes}"
+						    includes="com/sun/jini/**"/>
+		</jar>
+	</target>
+	
+	<!-- tasks to execute the test by category -->
+	<target name="run.test" depends="build.qa">
+		<java classname="com.sun.jini.qa.harness.QARunner" 
+			  fork="yes">
+			<jvmarg value="-Djava.security.policy=${qatests.home}/harness/policy/qa.policy" />
+			<jvmarg value="-Djava.util.logging.config.file=${qatests.home}/src/com/sun/jini/test/resources/qa1.logging"
/>
+			<arg value="${qatests.home}/src/com/sun/jini/test/resources/qaHarness.prop" />
+			<arg value="-testJar"/><arg value="${qatests.lib}/jiniharness.jar" />
+			<arg value="-categories"/><arg value="joinmanager" />
+			<arg value="-com.sun.jini.qa.harness.serviceMode"/><arg value="transient" />
+			<classpath>
+				<fileset dir="${qatests.lib}">
+					<include name="**/*.jar"/>
+				</fileset>
+				<fileset dir="${distribution.lib}">
+					<include name="**/*.jar"/>
+				</fileset>
+			</classpath>
+		</java>
+	</target>
+
+	<!-- examples of tasks to execute specific-named tests -->
+
+	<!-- <target name="all.integrationtests" depends="clean, build.release, install.policy,
jars, clean.qa, build.qa, run.test" /> -->
+	<target name="all.integrationtests" depends="clean.qa, build.qa, run.test" />
+	
 </project>



Mime
View raw message