From: Mikael Grankvist <mikael.grankvist@itmill.com>
Date: Wed, 25 Nov 2009 07:55:26 +0000 (+0000)
Subject: Changed test naming for integration tests #3386
X-Git-Tag: 6.7.0.beta1~2258
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=37f326e4bc3501b035aa563ebe89773c6cbfef07;p=vaadin-framework.git

Changed test naming for integration tests #3386

svn changeset:10001/svn branch:6.2
---

diff --git a/tests/integration-testscripts/sampler_deployment.tpl b/tests/integration-testscripts/sampler_deployment.tpl
index 00823cc62d..6fb253fc10 100644
--- a/tests/integration-testscripts/sampler_deployment.tpl
+++ b/tests/integration-testscripts/sampler_deployment.tpl
@@ -55,7 +55,7 @@
 <tr>
 	<td>screenCapture</td>
 	<td></td>
-	<td>@server@_1</td>
+	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
@@ -75,7 +75,7 @@
 <tr>
 	<td>screenCapture</td>
 	<td></td>
-	<td>@server@_2</td>
+	<td></td>
 </tr>
 
 </tbody></table>
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index 4de7fd9511..c36e482d22 100644
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -32,11 +32,11 @@
 	
 	<!-- Run sampler deployment test -->
 	<target name="test-sampler">
-		<fileset dir="integration-testscripts" id="html-test-files" includes="sampler_deployment.html"/>
+		<fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-sampler.html" />
 		<pathconvert pathsep=" " property="testfiles" refid="html-test-files" />
 		
 		<subant target="run-tests" failonerror="false" antfile="test.xml">
-			<property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}"/>
+			<property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" />
 			<property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" />
 			<property name="com.vaadin.testbench.deployment.url" value="${deployment.url}" />
 			<property name="browsers" value="${test_browsers}" />
@@ -49,13 +49,7 @@
 	<!-- Start and stop methods for servers -->
 	<target name="start-tomcat-4">
 		<sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-tomcat-4.1.40" />
-		<copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/sampler_deployment.html" overwrite="true">
-			<filterchain>
-				<replacetokens>
-					<token key="server" value="tomcat-4.1.40" />
-				</replacetokens>
-			</filterchain>
-		</copy>
+		<copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-tomcat-4.1.40-sampler.html" overwrite="true" />
 	</target>
 
 	<target name="stop-tomcat-4">
@@ -64,13 +58,7 @@
 	
 	<target name="start-tomcat-5">
 		<sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-tomcat-5.5.28" />
-		<copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/sampler_deployment.html" overwrite="true">
-			<filterchain>
-				<replacetokens>
-					<token key="server" value="tomcat-5.5.28" />
-				</replacetokens>
-			</filterchain>
-		</copy>
+		<copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-tomcat-5.5.28-sampler.html" overwrite="true" />
 	</target>
 
 	<target name="stop-tomcat-5">
@@ -79,13 +67,7 @@
 	
 	<target name="start-tomcat-6">
 		<sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-tomcat-6.0.20" />
-		<copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/sampler_deployment.html" overwrite="true">
-			<filterchain>
-				<replacetokens>
-					<token key="server" value="tomcat-6.0.20" />
-				</replacetokens>
-			</filterchain>
-		</copy>
+		<copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-tomcat-6.0.20-sampler.html" overwrite="true" />
 	</target>
 
 	<target name="stop-tomcat-6">
@@ -94,13 +76,7 @@
 	
 	<target name="start-jetty-5">
 		<sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jetty-5.1.15" />
-		<copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/sampler_deployment.html" overwrite="true">
-			<filterchain>
-				<replacetokens>
-					<token key="server" value="jetty-5.1.15" />
-				</replacetokens>
-			</filterchain>
-		</copy>
+		<copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-jetty-5.1.15-sampler.html" overwrite="true" />
 	</target>
 
 	<target name="stop-jetty-5">
@@ -109,13 +85,7 @@
 
 	<target name="start-jetty-6">
 		<sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jetty-6.1.22" />
-		<copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/sampler_deployment.html" overwrite="true">
-			<filterchain>
-				<replacetokens>
-					<token key="server" value="jetty-6.1.22" />
-				</replacetokens>
-			</filterchain>
-		</copy>
+		<copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-jetty-6.1.22-sampler.html" overwrite="true" />
 	</target>
 
 	<target name="stop-jetty-6">
@@ -124,13 +94,7 @@
 	
 	<target name="start-jetty-7">
 		<sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jetty-7.0.0" />
-		<copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/sampler_deployment.html" overwrite="true">
-			<filterchain>
-				<replacetokens>
-					<token key="server" value="jetty-7.0.0" />
-				</replacetokens>
-			</filterchain>
-		</copy>
+		<copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-jetty-7.0.0-sampler.html" overwrite="true" />
 	</target>
 
 	<target name="stop-jetty-7">
@@ -139,13 +103,7 @@
 	
 	<target name="start-jboss-3">
 		<sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jboss-3.2.8" />
-		<copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/sampler_deployment.html" overwrite="true">
-			<filterchain>
-				<replacetokens>
-					<token key="server" value="jboss-3.2.8" />
-				</replacetokens>
-			</filterchain>
-		</copy>
+		<copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-jboss-3.2.8-sampler.html" overwrite="true" />
 	</target>
 
 	<target name="stop-jboss-3">
@@ -154,13 +112,7 @@
 	
 	<target name="start-jboss-4">
 		<sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jboss-4.2.3" />
-		<copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/sampler_deployment.html" overwrite="true">
-			<filterchain>
-				<replacetokens>
-					<token key="server" value="jboss-4.2.3" />
-				</replacetokens>
-			</filterchain>
-		</copy>
+		<copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-jboss-4.2.3-sampler.html" overwrite="true" />
 	</target>
 
 	<target name="stop-jboss-4">
@@ -169,13 +121,7 @@
 	
 	<target name="start-jboss-5">
 		<sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jboss-5.0.1" />
-		<copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/sampler_deployment.html" overwrite="true">
-			<filterchain>
-				<replacetokens>
-					<token key="server" value="jboss-5.0.1" />
-				</replacetokens>
-			</filterchain>
-		</copy>
+		<copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-jboss-5.0.1-sampler.html" overwrite="true" />
 	</target>
 
 	<target name="stop-jboss-5">
@@ -184,13 +130,7 @@
 	
 	<target name="start-glassfish">
 		<sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-glassfish-2.1.1" />
-		<copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/sampler_deployment.html" overwrite="true">
-			<filterchain>
-				<replacetokens>
-					<token key="server" value="glassfish-2.1.1" />
-				</replacetokens>
-			</filterchain>
-		</copy>
+		<copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-glassfish-2.1.1-sampler.html" overwrite="true" />
 	</target>
 	
 	<target name="stop-glassfish">
@@ -199,11 +139,11 @@
 	
 	<!-- Test liferay sampler -->
 	<target name="test-liferay">
-		<fileset dir="integration-testscripts" id="html-test-files" includes="sampler_deployment_liferay.html"/>
+		<fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-liferay-5.2.3-sampler.html" />
 		<pathconvert pathsep=" " property="test-liferay" refid="html-test-files" />
 		
 		<subant target="run-tests" failonerror="false" antfile="test.xml">
-			<property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}"/>
+			<property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" />
 			<property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" />
 			<property name="com.vaadin.testbench.deployment.url" value="${deployment.url}" />
 			<property name="browsers" value="${test_browsers}" />
@@ -215,11 +155,11 @@
 	
 	<!-- "deploy" sampler to liferay -->
 	<target name="init-liferay">
-		<fileset dir="integration-testscripts" id="html-test-files" includes="Add_Sampler_to_Liferay.html"/>
+		<fileset dir="integration-testscripts" id="html-test-files" includes="Add_Sampler_to_Liferay.html" />
 		<pathconvert pathsep=" " property="init-liferay" refid="html-test-files" />
 		
 		<subant target="run-tests" failonerror="false" antfile="test.xml">
-			<property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}"/>
+			<property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" />
 			<property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" />
 			<property name="com.vaadin.testbench.deployment.url" value="${deployment.url}" />
 			<property name="browsers" value="winxp-firefox35" />
@@ -231,6 +171,7 @@
 	
 	<target name="start-liferay">
 		<sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-liferay-5.2.3" />
+		<copy file="integration-testscripts/sampler_deployment_liferay.tpl" tofile="integration-testscripts/integration-test-liferay-5.2.3-sampler.html" overwrite="true" />
 	</target>
 
 	<target name="stop-liferay">
@@ -239,11 +180,11 @@
 	
 	<!-- Run sampler deployment test for WebLogic server -->
 	<target name="test-weblogic">
-		<fileset dir="integration-testscripts" id="html-test-files" includes="sampler_deployment.html"/>
+		<fileset dir="integration-testscripts" id="html-test-files" includes="sampler_deployment.html" />
 		<pathconvert pathsep=" " property="test-weblogic" refid="html-test-files" />
 		
 		<subant target="run-tests" failonerror="false" antfile="test.xml">
-			<property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}"/>
+			<property name="com.vaadin.testbench.lib.dir" value="${com.vaadin.testbench.lib.dir}" />
 			<property name="com.vaadin.testbench.tester.host" value="${com.vaadin.testbench.tester.host}" />
 			<property name="com.vaadin.testbench.deployment.url" value="http://${sshHost}:7001" />
 			<property name="browsers" value="${test_browsers}" />
@@ -255,13 +196,7 @@
 	
 	<target name="start-weblogic9">
 		<sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-weblogic-9.2" />
-		<copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/sampler_deployment.html" overwrite="true">
-			<filterchain>
-				<replacetokens>
-					<token key="server" value="weblogic-9.2" />
-				</replacetokens>
-			</filterchain>
-		</copy>
+		<copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-weblogic-9.2-sampler.html" overwrite="true" />
 	</target>
 
 	<target name="stop-weblogic9">
@@ -270,13 +205,7 @@
 	
 	<target name="start-weblogic10">
 		<sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-weblogic-10.3" />
-		<copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/sampler_deployment.html" overwrite="true">
-			<filterchain>
-				<replacetokens>
-					<token key="server" value="weblogic-10.3" />
-				</replacetokens>
-			</filterchain>
-		</copy>
+		<copy file="integration-testscripts/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-weblogic-10.3-sampler.html" overwrite="true" />
 	</target>
 
 	<target name="stop-weblogic10">
@@ -286,75 +215,104 @@
 	<!-- Server setup, test and teardown targets. -->
 	<target name="tomcat4">
 		<antcall target="start-tomcat-4"/>
-		<antcall target="test-sampler"/>
+		<antcall target="test-sampler">
+			<param name="server-name" value="tomcat-4.1.40" />
+		</antcall>
 		<antcall target="stop-tomcat-4"/>
 	</target>
 	
 	<target name="tomcat5">
 		<antcall target="start-tomcat-5"/>
-		<antcall target="test-sampler"/>
+		<antcall target="test-sampler">
+			<param name="server-name" value="tomcat-5.5.28" />
+		</antcall>
 		<antcall target="stop-tomcat-5"/>
 	</target>	
 	
 	<target name="tomcat6">
 		<antcall target="start-tomcat-6"/>
-		<antcall target="test-sampler"/>
+		<antcall target="test-sampler">
+			<param name="server-name" value="tomcat-6.0.20" />
+		</antcall>
 		<antcall target="stop-tomcat-6"/>
 	</target>
 	
 	<target name="jetty5">
 		<antcall target="start-jetty-5"/>
-		<antcall target="test-sampler"/>
+		<antcall target="test-sampler">
+			<param name="server-name" value="jetty-5.1.15" />
+		</antcall>
 		<antcall target="stop-jetty-5"/>
 	</target>
 	
 	<target name="jetty6">
 		<antcall target="start-jetty-6"/>
-		<antcall target="test-sampler"/>
+		<antcall target="test-sampler">
+			<param name="server-name" value="jetty-6.1.22" />
+		</antcall>
 		<antcall target="stop-jetty-6"/>
 	</target>
 	
 	<target name="jetty7">
 		<antcall target="start-jetty-7"/>
-		<antcall target="test-sampler"/>
+		<antcall target="test-sampler">
+			<param name="server-name" value="jetty-7.0.0" />
+		</antcall>
 		<antcall target="stop-jetty-7"/>
 	</target>
 	
 	<target name="jboss3">
 		<antcall target="start-jboss-3"/>
-		<antcall target="test-sampler"/>
+		<antcall target="test-sampler">
+			<param name="server-name" value="jboss-3.2.8" />
+		</antcall>
 		<antcall target="stop-jboss-3"/>
 	</target>
 	
 	<target name="jboss4">
 		<antcall target="start-jboss-4"/>
-		<antcall target="test-sampler"/>
+		<antcall target="test-sampler">
+			<param name="server-name" value="jboss-4.2.3" />
+		</antcall>
 		<antcall target="stop-jboss-4"/>
 	</target>
 	
 	<target name="jboss5">
 		<antcall target="start-jboss-5"/>
-		<antcall target="test-sampler"/>
+		<antcall target="test-sampler">
+			<param name="server-name" value="jboss-5.0.1" />
+		</antcall>
 		<antcall target="stop-jboss-5"/>
 	</target>
 		
 	<target name="glassfish">
 		<antcall target="start-glassfish"/>
-		<antcall target="test-sampler"/>
+		<antcall target="test-sampler">
+			<param name="server-name" value="glassfish-2.1.1" />
+		</antcall>
 		<antcall target="stop-glassfish"/>
 	</target>
 	
-	<target name="liferay" depends="start-liferay,init-liferay,test-liferay,stop-liferay" />
+	<target name="liferay">
+		<antcall target="start-liferay" />
+		<antcall target="init-liferay" />
+		<antcall target="test-liferay" />
+		<antcall target="stop-liferay" />
+	</target>
 	
 	<target name="weblogic9">
 		<antcall target="start-weblogic9"/>
-		<antcall target="test-weblogic"/>
+		<antcall target="test-weblogic">
+			<param name="server-name" value="weblogic-9.2" />
+		</antcall>
 		<antcall target="stop-weblogic9"/>
 	</target>
 	
 	<target name="weblogic10">
 		<antcall target="start-weblogic10"/>
-		<antcall target="test-weblogic"/>
+		<antcall target="test-weblogic">
+			<param name="server-name" value="weblogic-10.3" />
+		</antcall>
 		<antcall target="stop-weblogic10"/>
 	</target>