[seam-commits] Seam SVN: r11386 - branches/enterprise/JBPAPP_5_0/src/test/ftest.

seam-commits at lists.jboss.org seam-commits at lists.jboss.org
Fri Aug 14 12:53:31 EDT 2009


Author: jharting
Date: 2009-08-14 12:53:31 -0400 (Fri, 14 Aug 2009)
New Revision: 11386

Modified:
   branches/enterprise/JBPAPP_5_0/src/test/ftest/build.xml
Log:
JBPAPP-2497 Added a functional test for helloworld example

Modified: branches/enterprise/JBPAPP_5_0/src/test/ftest/build.xml
===================================================================
--- branches/enterprise/JBPAPP_5_0/src/test/ftest/build.xml	2009-08-14 15:52:11 UTC (rev 11385)
+++ branches/enterprise/JBPAPP_5_0/src/test/ftest/build.xml	2009-08-14 16:53:31 UTC (rev 11386)
@@ -22,7 +22,7 @@
 -->
 
 <!-- core build file for executing and managing Seam functional tests -->
-<project name="ftest.base.build" default="testall" basedir=".">
+<project name="ftest.base.build" basedir=".">
 
 	<!-- Location of Seam -->
 	<dirname property="seam.dir" file="${ant.file.ftest.base.build}/../../../" />
@@ -42,149 +42,72 @@
 		</fileset>
 	</path>
 
-	<!-- TODO : should the libs be in seam/lib and managed with mvn? -->
-	<taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="../../../lib/groovy-all.jar"/>
-
-	<target name="testall" description="Run functional testsuite based on container property">
-		<fail unless="container">Please set container property.</fail>
-		<antcall target="testall.${container}" />
-	</target>
-
-	<target name="testall.jboss4" description="Run functional testsuite for JBoss 4">
-		<property name="container" value="jboss4" />
-		<antcall target="start.container" />
+	<target name="testall.1" description="Run functional testsuite for JBoss 5">
+		<property name="container" value="jboss5" />
 		<antcall target="start.selenium.server" />
-		<!-- Execute tests for all examples jboss-->
 		<testexample name="blog" />
 		<testexample name="booking" />
 		<testexample name="drools" />
 		<testexample name="dvdstore" />
 		<testexample name="contactlist" />
-		<testexample name="excel" />
-		<testexample name="groovybooking" />
-		<testexample name="hibernate" />
-		<testexample name="icefaces" />
-		<testexample name="itext" />
-		<testexample name="jpa" />
-		<testexample name="mail" />
-		<testexample name="messages" />
-		<testexample name="nestedbooking" />
-		<testexample name="numberguess" />
-		<testexample name="openid" />
-		<testexample name="quartz" />
-		<testexample name="registration" />
-		<testexample name="remoting/chatroom" />
-		<testexample name="rss" />
-		<testexample name="seambay" />
-		<testexample name="seamdiscs" />
-		<testexample name="seampay" />
-		<testexample name="seamspace" />
-		<testexample name="spring" />
-		<testexample name="todo" />
-		<testexample name="ui" />
-		<testexample name="wicket" />
-		<testexample name="wicket-runtime" />
 		<antcall target="stop.selenium.server" />
-		<antcall target="stop.container" />
 	</target>
 	
-	<target name="testall.jboss5" description="Run functional testsuite for JBoss 5">
+	<target name="testall.2" description="Run functional testsuite for JBoss 5">
 		<property name="container" value="jboss5" />
-		<antcall target="start.container" />
 		<antcall target="start.selenium.server" />
-		<!-- Execute tests for all examples jboss-->
-		<testexample name="blog" />
-		<testexample name="booking" />
-		<testexample name="drools" />
-		<testexample name="dvdstore" />
-		<testexample name="contactlist" />
 		<testexample name="excel" />
-		<testexample name="guice" />
 		<testexample name="groovybooking" />
 		<testexample name="hibernate" />
-		<testexample name="icefaces" />
 		<testexample name="itext" />
 		<testexample name="jee5/booking" />
+		<antcall target="stop.selenium.server" />
+	</target>
+	
+	<target name="testall.3" description="Run functional testsuite for JBoss 5">
+		<property name="container" value="jboss5" />
+		<antcall target="start.selenium.server" />
 		<testexample name="jpa" />
 		<testexample name="mail" />
 		<testexample name="messages" />
-		<testexample name="metawidget/booking" />
-		<testexample name="metawidget/dvdstore" />
-		<testexample name="metawidget/groovybooking" />
 		<testexample name="nestedbooking" />
 		<testexample name="numberguess" />
+		<antcall target="stop.selenium.server" />
+	</target>
+	
+	<target name="testall.4" description="Run functional testsuite for JBoss 5">
+		<property name="container" value="jboss5" />
+		<antcall target="start.selenium.server" />
 		<testexample name="openid" />
 		<testexample name="quartz" />
 		<testexample name="registration" />
 		<testexample name="remoting/chatroom" />
 		<testexample name="remoting/helloworld" />
-		<testexample name="rss" />
 		<testexample name="seambay" />
+		<antcall target="stop.selenium.server" />
+	</target>
+	
+	<target name="testall.5" description="Run functional testsuite for JBoss 5">
+		<property name="container" value="jboss5" />
+		<antcall target="start.selenium.server" />
 		<testexample name="seampay" />
 		<testexample name="seamspace" />
 		<testexample name="spring" />
 		<testexample name="todo" />
 		<testexample name="ui" />
-		<testexample name="wicket" />
-		<testexample name="wicket-runtime" />
 		<antcall target="stop.selenium.server" />
-		<antcall target="stop.container" />
 	</target>
 
-	<target name="testall.jboss-embedded" description="Run functional testsuite for JBoss Embedded">
-		<property name="container" value="jboss-embedded" />
-		<antcall target="start.selenium.server" />
-		<!-- Execute tests for all examples on jboss-embedded -->
-		<testexample name="blog" />
-		<testexample name="dvdstore" />
-		<testexample name="messages" />
-		<testexample name="numberguess" />
-		<testexample name="registration" />
-		<testexample name="seambay" />
-		<testexample name="seampay" />
-		<testexample name="todo" />
-		<testexample name="booking" />
-		<testexample name="jpa" />
-		<testexample name="hibernate" />
-		<antcall target="stop.selenium.server" />
-	</target>
-
-	<target name="testall.tomcat6" description="Run functional testsuite for Tomcat 6">
-
-		<property name="container" value="tomcat6" />
-		<antcall target="start.selenium.server" />
-
-		<testexample name="jpa" />
-		<testexample name="hibernate" />
-
-		<antcall target="stop.selenium.server" />
-	</target>
-
 	<target name="test" description="Run tests for single example. Container selection is based on the value of container property">
 		<fail unless="container">Please set container property.</fail>
 		<antcall target="test.${container}" />
 	</target>
-
-	<target name="test.jboss4" description="Run tests for single example on JBoss 4">
-		<property name="container" value="jboss4" />
-		<antcall target="test.single.example" />
-	</target>
-
+	
 	<target name="test.jboss5" description="Run tests for single example on JBoss 5">
 		<property name="container" value="jboss5" />
 		<antcall target="test.single.example" />
 	</target>
 
-	<target name="test.tomcat6" description="Run tests for single example on Tomcat 6">
-		<property name="container" value="tomcat6" />
-		<antcall target="test.single.example" />
-	</target>
-
-	<target name="test.jboss-embedded" description="Run tests for single example on JBoss Embedded">
-		<property name="container" value="jboss-embedded" />
-		<antcall target="test.single.example" />
-	</target>
-
 	<target name="test.single.example">
 		<antcall target="start.selenium.server" />
 
@@ -201,18 +124,13 @@
 		<cleanexample name="dvdstore" />
 		<cleanexample name="contactlist" />
 		<cleanexample name="excel" />
-		<cleanexample name="guice" />
 		<cleanexample name="groovybooking" />
 		<cleanexample name="hibernate" />
-		<cleanexample name="icefaces" />
 		<cleanexample name="itext" />
 		<cleanexample name="jee5/booking" />
 		<cleanexample name="jpa" />
 		<cleanexample name="mail" />
 		<cleanexample name="messages" />
-		<cleanexample name="metawidget/booking" />
-		<cleanexample name="metawidget/dvdstore" />
-		<cleanexample name="metawidget/groovybooking" />
 		<cleanexample name="nestedbooking" />
 		<cleanexample name="numberguess" />
 		<cleanexample name="openid" />
@@ -220,7 +138,6 @@
 		<cleanexample name="registration" />
 		<cleanexample name="remoting/chatroom" />
 		<cleanexample name="remoting/helloworld" />
-		<cleanexample name="rss" />
 		<cleanexample name="seambay" />
 		<cleanexample name="seamdiscs" />
 		<cleanexample name="seampay" />
@@ -228,8 +145,6 @@
 		<cleanexample name="spring" />
 		<cleanexample name="todo" />
 		<cleanexample name="ui" />
-		<cleanexample name="wicket" />
-		<cleanexample name="wicket-runtime" />
 	</target>
 
 	<target name="undeployall">
@@ -241,23 +156,17 @@
 		<undeployexample name="contactlist" />
 		<undeployexample name="excel" />
 		<undeployexample name="groovybooking" />
-		<undeployexample name="guice" />
 		<undeployexample name="hibernate" />
-		<undeployexample name="icefaces" />
 		<undeployexample name="itext" />
 		<undeployexample name="jee5/booking" />
 		<undeployexample name="jpa" />
 		<undeployexample name="mail" />
 		<undeployexample name="messages" />
-		<undeployexample name="metawidget/booking" />
-		<undeployexample name="metawidget/dvdstore" />
-		<undeployexample name="metawidget/groovybooking" />
 		<undeployexample name="nestedbooking" />
 		<undeployexample name="numberguess" />
 		<undeployexample name="openid" />
 		<undeployexample name="quartz" />
 		<undeployexample name="registration" />
-		<undeployexample name="rss" />
 		<undeployexample name="remoting/chatroom" />
 		<undeployexample name="remoting/helloworld" />
 		<undeployexample name="seambay" />
@@ -267,7 +176,6 @@
 		<undeployexample name="spring" />
 		<undeployexample name="todo" />
 		<undeployexample name="ui" />
-		<undeployexample name="wicket" />
 	</target>
 
 
@@ -299,17 +207,6 @@
 		<attribute name="path" default="examples/@{name}" />
 		<attribute name="message" default="Running functional tests on @{name} example" />
 		<sequential>
-			<groovy>
-				<![CDATA[
-				def testExamplesRunSoFar = properties['testExamplesRunSoFar'] == null ? 0 : Integer.valueOf(properties['testExamplesRunSoFar']);
-				def jbossDeploymentsRestart = properties['jboss.deployments.restart'] == null ? 0 : Integer.valueOf(properties['jboss.deployments.restart']);
-				if (jbossDeploymentsRestart > 0 && testExamplesRunSoFar > 0 && testExamplesRunSoFar % jbossDeploymentsRestart  == 0 ) {
-				ant.antcall(target:"restart.container");
-				}
-				testExamplesRunSoFar++;
-				properties['testExamplesRunSoFar'] = testExamplesRunSoFar;
-				]]>
-			</groovy>
 			<echo>@{message}</echo>
 			<callExample path="@{path}" target="test" />
 		</sequential>
@@ -343,22 +240,8 @@
 			</ant>
 		</sequential>
 	</macrodef>
-
-	<target name="restart.container" if="run.container.per.suite">
-		<echo>Restarting container</echo>
-		<antcall target="stop.container" >
-		</antcall>
-		<antcall target="start.container" >
-		</antcall>
-	</target>
 	
-	<target name="stop.container" if="run.container.per.suite">
-		<echo>Stopping container</echo>
-		<ant antfile="examples/build.xml" target="stop.container.jboss" inheritall="false">
-			<property name="container" value="${container}" />
-		</ant>	
-	</target>
-	<target name="start.container" if="run.container.per.suite">
+	<target name="start.container.before.suite" if="run.container.per.suite">
 		<echo>Starting container</echo>
 		<ant antfile="examples/build.xml" target="start.container.jboss" inheritall="false">
 			<property name="container" value="${container}" />



More information about the seam-commits mailing list