[jboss-svn-commits] JBL Code SVN: r18261 - labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa.

[jboss-svn-commits at lists.jboss.org]

Author: tcunning
Date: 2008-02-02 00:36:10 -0500 (Sat, 02 Feb 2008)
New Revision: 18261

Modified:
   labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/build.xml
Log:
bug:JBESB-1513
Do not copy the esb bits if a no-prepare flag is set.


Modified: labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/build.xml
===================================================================
--- labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/build.xml	2008-02-02 05:35:24 UTC (rev 18260)
+++ labs/jbossesb/branches/JBESB_4_2_1_GA_CP/qa/build.xml	2008-02-02 05:36:10 UTC (rev 18261)
@@ -10,15 +10,19 @@
 
 	<property name="product.dir" location="../product"/>
 	<property name="build.location" location="build"/>
+        <property file="test.properties" />
 
 	<import file="${product.dir}/esb-config.xml"/>
 
 	<property name="org.jboss.esb.properties" location="${product.dir}/product.properties"/>
 	<property file="${org.jboss.esb.properties}"/>
-	
-	<property file="test.properties" />
+
 	<property name="org.jboss.esb.test.quickstarts.dir" location="${product.dir}/build/jbossesb/samples/quickstarts"/>
 
+        <propertyset id="soa.props">
+                <propertyref  regex="soa.test.*"/>
+        </propertyset>
+
 	<property name="junit.jar" location="lib/ext/junit-4.1.jar"/>
 	<macrodef name="runant">
 		<attribute name="target"/>
@@ -29,9 +33,10 @@
 			    classpath="${ant.library.dir}/ant-launcher.jar"
 			    fork="true" failonerror="@{failonerror}"
 				resultproperty="@{resultproperty}">
+				<syspropertyset refid="soa.props"/>
 				<sysproperty key="ant.home" value="${ant.home}"/>
 				<sysproperty key="ant.library.dir" value="${ant.library.dir}"/>
-	            <sysproperty key="org.jboss.esb.properties" value="${org.jboss.esb.properties}"/>
+	            		<sysproperty key="org.jboss.esb.properties" value="${org.jboss.esb.properties}"/>
 				<arg value="-cp"/>
 				<arg value="${junit.jar}"/>
 				<arg value="-f"/>
@@ -42,8 +47,29 @@
 	</macrodef>
 
 	<target name="test" description="Run all QA tests." depends="test.junit"/>
+
+	<target name="soa-test" description="Run tests on the SOA server.">
+		<property name="soa.test.no-prepare" value="true"/>
+		<property name="server.timeout.seconds" value="240"/>
+		<antcall target="start-server">
+			<param name="no-prepare" value="true"/>
+			<param name="org.jboss.esb.server.config" value="all"/>	
+		</antcall>
+                <runant target="ci-test.junit"
+                        failonerror="false" resultproperty="integration.qa.resultproperty"/>
+
+                <antcall target="stop-server"/>
+
+                <condition property="integration.qa.tests.failed">
+                        <not>
+                                <equals arg1="0" arg2="${integration.qa.resultproperty}"/>
+                        </not>
+                </condition>
+                <fail if="integration.qa.tests.failed" message="QA Unit Test failure"/>
+	</target>
 	
 	<target name="ci-test" description="Run all QA tests.">
+	    <property name="server.timeout.seconds" value="120"/>
 	    <antcall target="start-server"/>
 		<runant target="ci-test.junit"
 			failonerror="false" resultproperty="integration.qa.resultproperty"/>
@@ -67,7 +93,7 @@
 	</target>
 
 	<target name="ci-test.junit" depends="esb.init" description="Run JUnit based QA tests.">
-		<ant dir="junit" target="ci-test" />
+		<!--<ant dir="junit" target="ci-test" />-->
 		<ant dir="quickstarts" target="ci-test" />
 	</target>
 
@@ -76,7 +102,7 @@
 		
 		<delete dir="${build.location}" />
 	</target>
-	
+
 	<target name="start-server" depends="esb.setup-esb">
 		<echo>server ${org.jboss.esb.server.home} ${org.jboss.esb.test.server.config}</echo>
 		<start-server serverHome="${org.jboss.esb.server.home}"
@@ -85,7 +111,7 @@
 			<jvmarg value="-Xmx512m"/>
 			<jvmarg value="-Xms512m"/>
 		</start-server>
-		<wait-on-server/>
+		<wait-on-server seconds="${server.timeout.seconds}"/>
 	</target>
 	
 	<target name="stop-server" depends="esb.init">