#7266 converted most integration tests not to use Sampler, related screenshot updates

svn changeset:20086/svn branch:6.7
author: Henri Sara <henri.sara@itmill.com> 2011-08-03 05:07:28 +0000
committer: Henri Sara <henri.sara@itmill.com> 2011-08-03 05:07:28 +0000
commit: 493f179c254a873a7a7ddf36f2a642c9386028da (patch)
tree: 9ee5059182906dcf08af08737633607046734ff5 /tests
parent: 577d3578bd373a53e575bd6f90b7a8e879381588 (diff)
download: vaadin-framework-493f179c254a873a7a7ddf36f2a642c9386028da.tar.gz
vaadin-framework-493f179c254a873a7a7ddf36f2a642c9386028da.zip
3 files changed, 81 insertions, 122 deletions
diff --git a/tests/integration-testscripts/common/addressbook_deployment.tpl b/tests/integration-testscripts/common/addressbook_deployment.tpl
new file mode 100644
index 0000000000..cf2d9364e4
--- /dev/null
+++ b/tests/integration-testscripts/common/addressbook_deployment.tpl
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="http://vaadin-integration-tests:8080/" />
+<title>addressbook_deployment</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">addressbook_deployment</td></tr>
+</thead><tbody>
+<tr>
+	<td>openAndWait</td>
+	<td>/demo/AddressBook</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=demoAddressBook::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]/domChild[0]</td>
+	<td>62,13</td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>500</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>Marge_selected</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=demoAddressBook::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>500</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>Marge_in_edit_mode</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/integration-testscripts/common/sampler_deployment.tpl b/tests/integration-testscripts/common/sampler_deployment.tpl
deleted file mode 100644
index f98fa98133..0000000000
--- a/tests/integration-testscripts/common/sampler_deployment.tpl
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<link rel="selenium.base" href="" />
-<title>sampler_deployment</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">sampler_deployment</td></tr>
-</thead><tbody>
-<tr>
-	<td>openAndWait</td>
-	<td>/demo</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForVaadin</td>
-	<td></td>
-	<td></td>
-</tr>
-<tr>
-	<td>mouseClickAndWait</td>
-	<td>//div[@id='sampler']/a/strong</td>
-	<td>96,14</td>
-</tr>
-<tr>
-	<td>pause</td>
-	<td>1000</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForVaadin</td>
-	<td></td>
-	<td></td>
-</tr>
-<!--Start scrolling through all samples in order-->
-<tr>
-	<td>mouseClick</td>
-	<td>vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[5]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td>
-	<td>16,10</td>
-</tr>
-<tr>
-	<td>waitForVaadin</td>
-	<td></td>
-	<td></td>
-</tr>
-<tr>
-	<td>mouseClick</td>
-	<td>vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[6]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td>
-	<td>11,13</td>
-</tr>
-<tr>
-	<td>waitForVaadin</td>
-	<td></td>
-	<td></td>
-</tr>
-<tr>
-	<td>pause</td>
-	<td>500</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>tooltips</td>
-</tr>
-<tr>
-	<td>mouseClick</td>
-	<td>vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[6]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td>
-	<td>11,13</td>
-</tr>
-<tr>
-	<td>waitForVaadin</td>
-	<td></td>
-	<td></td>
-</tr>
-<tr>
-	<td>pause</td>
-	<td>500</td>
-	<td></td>
-</tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>icons</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index 0bb9467444..e665213e12 100644
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -40,9 +40,9 @@
 		<scp file="${demo.war}" todir="${user}@${test.integration.server}:integration-tests/servers/demo.war" keyfile="${sshkey.file}" passphrase="${passphrase}" />
 	</target>
 	
-	<!-- Run sampler deployment test -->
-	<target name="integration-test-sampler">
-		<fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-sampler.html" />
+	<!-- Run basic address book test -->
+	<target name="integration-test-addressbook">
+		<fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-addressbook.html" />
 		<pathconvert pathsep=" " property="testfiles" refid="html-test-files" />
 		
 		<subant target="run-tests" failonerror="false" antfile="test.xml">
@@ -62,7 +62,7 @@
 	<!-- Start and stop methods for servers -->
 	<target name="integration-test-start-tomcat-4">
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-tomcat-4.1.40" />
-		<copy file="integration-testscripts/common/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-tomcat-4.1.40-sampler.html" overwrite="true" />
+		<copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-tomcat-4.1.40-addressbook.html" overwrite="true" />
 	</target>
 
 	<target name="integration-test-stop-tomcat-4">
@@ -71,7 +71,7 @@
 	
 	<target name="integration-test-start-tomcat-5">
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-tomcat-5.5.28" />
-		<copy file="integration-testscripts/common/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-tomcat-5.5.28-sampler.html" overwrite="true" />
+		<copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-tomcat-5.5.28-addressbook.html" overwrite="true" />
 	</target>
 
 	<target name="integration-test-stop-tomcat-5">
@@ -80,7 +80,7 @@
 	
 	<target name="integration-test-start-tomcat-6">
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-tomcat-6.0.20" />
-		<copy file="integration-testscripts/common/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-tomcat-6.0.20-sampler.html" overwrite="true" />
+		<copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-tomcat-6.0.20-addressbook.html" overwrite="true" />
 	</target>
 
 	<target name="integration-test-stop-tomcat-6">
@@ -89,7 +89,7 @@
 	
 	<target name="integration-test-start-jetty-5">
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jetty-5.1.15" />
-		<copy file="integration-testscripts/common/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-jetty-5.1.15-sampler.html" overwrite="true" />
+		<copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-jetty-5.1.15-addressbook.html" overwrite="true" />
 	</target>
 
 	<target name="integration-test-stop-jetty-5">
@@ -98,7 +98,7 @@
 
 	<target name="integration-test-start-jetty-6">
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jetty-6.1.22" />
-		<copy file="integration-testscripts/common/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-jetty-6.1.22-sampler.html" overwrite="true" />
+		<copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-jetty-6.1.22-addressbook.html" overwrite="true" />
 	</target>
 
 	<target name="integration-test-stop-jetty-6">
@@ -107,7 +107,7 @@
 	
 	<target name="integration-test-start-jetty-7">
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jetty-7.0.0" />
-		<copy file="integration-testscripts/common/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-jetty-7.0.0-sampler.html" overwrite="true" />
+		<copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-jetty-7.0.0-addressbook.html" overwrite="true" />
 	</target>
 
 	<target name="integration-test-stop-jetty-7">
@@ -116,7 +116,7 @@
 	
 	<target name="integration-test-start-jboss-3">
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jboss-3.2.8" />
-		<copy file="integration-testscripts/common/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-jboss-3.2.8-sampler.html" overwrite="true" />
+		<copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-jboss-3.2.8-addressbook.html" overwrite="true" />
 	</target>
 
 	<target name="integration-test-stop-jboss-3">
@@ -125,7 +125,7 @@
 	
 	<target name="integration-test-start-jboss-4">
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jboss-4.2.3" />
-		<copy file="integration-testscripts/common/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-jboss-4.2.3-sampler.html" overwrite="true" />
+		<copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-jboss-4.2.3-addressbook.html" overwrite="true" />
 	</target>
 
 	<target name="integration-test-stop-jboss-4">
@@ -134,7 +134,7 @@
 	
 	<target name="integration-test-start-jboss-5">
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jboss-5.0.1" />
-		<copy file="integration-testscripts/common/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-jboss-5.0.1-sampler.html" overwrite="true" />
+		<copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-jboss-5.0.1-addressbook.html" overwrite="true" />
 	</target>
 
 	<target name="integration-test-stop-jboss-5">
@@ -143,7 +143,7 @@
 	
 	<target name="integration-test-start-glassfish2">
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-glassfish-2.1.1" />
-		<copy file="integration-testscripts/common/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-glassfish-2.1.1-sampler.html" overwrite="true" />
+		<copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-glassfish-2.1.1-addressbook.html" overwrite="true" />
 	</target>
 	
 	<target name="integration-test-stop-glassfish2">
@@ -152,7 +152,7 @@
 	
 	<target name="integration-test-start-glassfish3">
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-glassfish-3" />
-		<copy file="integration-testscripts/common/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-glassfish-3-sampler.html" overwrite="true" />
+		<copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-glassfish-3-addressbook.html" overwrite="true" />
 	</target>
 	
 	<target name="integration-test-stop-glassfish3">
@@ -369,9 +369,9 @@
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-eXo-3.0.3" />
 	</target>
 	
-	<!-- Run sampler deployment test for WebLogic server -->
+	<!-- Run address book test for WebLogic server -->
 	<target name="integration-test-test-weblogic">
-		<fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-sampler.html" />
+		<fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-addressbook.html" />
 		<pathconvert pathsep=" " property="test-weblogic" refid="html-test-files" />
 		
 		<subant target="run-tests" failonerror="false" antfile="test.xml">
@@ -389,7 +389,7 @@
 	
 	<target name="integration-test-start-weblogic9">
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-weblogic-9.2" />
-		<copy file="integration-testscripts/common/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-weblogic-9.2-sampler.html" overwrite="true" />
+		<copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-weblogic-9.2-addressbook.html" overwrite="true" />
 	</target>
 
 	<target name="integration-test-stop-weblogic9">
@@ -398,7 +398,7 @@
 	
 	<target name="integration-test-start-weblogic10">
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-weblogic-10.3" />
-		<copy file="integration-testscripts/common/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-weblogic-10.3-sampler.html" overwrite="true" />
+		<copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-weblogic-10.3-addressbook.html" overwrite="true" />
 	</target>
 
 	<target name="integration-test-stop-weblogic10">
@@ -438,7 +438,7 @@
 	<!-- Server setup, test and teardown targets. -->
 	<target name="integration-test-tomcat4">
 		<antcall target="integration-test-start-tomcat-4"/>
-		<antcall target="integration-test-sampler">
+		<antcall target="integration-test-addressbook">
 			<param name="server-name" value="tomcat-4.1.40" />
 		</antcall>
 		<antcall target="integration-test-stop-tomcat-4"/>
@@ -446,7 +446,7 @@
 	
 	<target name="integration-test-tomcat5">
 		<antcall target="integration-test-start-tomcat-5"/>
-		<antcall target="integration-test-sampler">
+		<antcall target="integration-test-addressbook">
 			<param name="server-name" value="tomcat-5.5.28" />
 		</antcall>
 		<antcall target="integration-test-stop-tomcat-5"/>
@@ -454,7 +454,7 @@
 	
 	<target name="integration-test-tomcat6">
 		<antcall target="integration-test-start-tomcat-6"/>
-		<antcall target="integration-test-sampler">
+		<antcall target="integration-test-addressbook">
 			<param name="server-name" value="tomcat-6.0.20" />
 		</antcall>
 		<antcall target="integration-test-stop-tomcat-6"/>
@@ -462,7 +462,7 @@
 	
 	<target name="integration-test-jetty5">
 		<antcall target="integration-test-start-jetty-5"/>
-		<antcall target="integration-test-sampler">
+		<antcall target="integration-test-addressbook">
 			<param name="server-name" value="jetty-5.1.15" />
 		</antcall>
 		<antcall target="integration-test-stop-jetty-5"/>
@@ -470,7 +470,7 @@
 	
 	<target name="integration-test-jetty6">
 		<antcall target="integration-test-start-jetty-6"/>
-		<antcall target="integration-test-sampler">
+		<antcall target="integration-test-addressbook">
 			<param name="server-name" value="jetty-6.1.22" />
 		</antcall>
 		<antcall target="integration-test-stop-jetty-6"/>
@@ -478,7 +478,7 @@
 	
 	<target name="integration-test-jetty7">
 		<antcall target="integration-test-start-jetty-7"/>
-		<antcall target="integration-test-sampler">
+		<antcall target="integration-test-addressbook">
 			<param name="server-name" value="jetty-7.0.0" />
 		</antcall>
 		<antcall target="integration-test-stop-jetty-7"/>
@@ -486,7 +486,7 @@
 	
 	<target name="integration-test-jboss3">
 		<antcall target="integration-test-start-jboss-3"/>
-		<antcall target="integration-test-sampler">
+		<antcall target="integration-test-addressbook">
 			<param name="server-name" value="jboss-3.2.8" />
 		</antcall>
 		<antcall target="integration-test-stop-jboss-3"/>
@@ -494,7 +494,7 @@
 	
 	<target name="integration-test-jboss4">
 		<antcall target="integration-test-start-jboss-4"/>
-		<antcall target="integration-test-sampler">
+		<antcall target="integration-test-addressbook">
 			<param name="server-name" value="jboss-4.2.3" />
 		</antcall>
 		<antcall target="integration-test-stop-jboss-4"/>
@@ -502,7 +502,7 @@
 	
 	<target name="integration-test-jboss5">
 		<antcall target="integration-test-start-jboss-5"/>
-		<antcall target="integration-test-sampler">
+		<antcall target="integration-test-addressbook">
 			<param name="server-name" value="jboss-5.0.1" />
 		</antcall>
 		<antcall target="integration-test-stop-jboss-5"/>
@@ -510,7 +510,7 @@
 		
 	<target name="integration-test-glassfish2">
 		<antcall target="integration-test-start-glassfish2"/>
-		<antcall target="integration-test-sampler">
+		<antcall target="integration-test-addressbook">
 			<param name="server-name" value="glassfish-2.1.1" />
 		</antcall>
 		<antcall target="integration-test-stop-glassfish2"/>
@@ -518,7 +518,7 @@
 	
 	<target name="integration-test-glassfish3">
 		<antcall target="integration-test-start-glassfish3"/>
-		<antcall target="integration-test-sampler">
+		<antcall target="integration-test-addressbook">
 			<param name="server-name" value="glassfish-3" />
 		</antcall>
 		<antcall target="integration-test-stop-glassfish3"/>
author	Henri Sara <henri.sara@itmill.com>	2011-08-03 05:07:28 +0000
committer	Henri Sara <henri.sara@itmill.com>	2011-08-03 05:07:28 +0000
commit	493f179c254a873a7a7ddf36f2a642c9386028da (patch)
tree	9ee5059182906dcf08af08737633607046734ff5 /tests
parent	577d3578bd373a53e575bd6f90b7a8e879381588 (diff)
download	vaadin-framework-493f179c254a873a7a7ddf36f2a642c9386028da.tar.gz vaadin-framework-493f179c254a873a7a7ddf36f2a642c9386028da.zip