]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 577d357)
#7266 converted most integration tests not to use Sampler, related screenshot updates
authorHenri Sara <henri.sara@itmill.com>
Wed, 3 Aug 2011 05:07:28 +0000 (05:07 +0000)
committerHenri Sara <henri.sara@itmill.com>
Wed, 3 Aug 2011 05:07:28 +0000 (05:07 +0000)
svn changeset:20086/svn branch:6.7

build/build.xml patch | blob | history
tests/integration-testscripts/common/addressbook_deployment.tpl [new file with mode: 0644] patch | blob
tests/integration-testscripts/common/sampler_deployment.tpl [deleted file] patch | blob | history
tests/integration_tests.xml patch | blob | history

diff --git a/build/build.xml b/build/build.xml
index 5a0379abbe4c5d80d4c160423a47394d5adaf81e..26951271aeebeea25a3872acb420c431eea2db74 100644 (file)
--- a/build/build.xml
+++ b/build/build.xml
@@ -547,7 +547,7 @@
         <copy todir="${output-dir}/WebContent">
             <fileset dir="WebContent">
                 <exclude name="**/.svn" />
-                <!-- TODO check what is neccessary -->
+                <!-- TODO check what is necessary -->
                 <!-- These are needed for running tests, but are copied during testing. -->
                 <exclude name="VAADIN/themes/tests*"/>
                 <exclude name="VAADIN/themes/tests-magi/**/*" />
diff --git a/tests/integration-testscripts/common/addressbook_deployment.tpl b/tests/integration-testscripts/common/addressbook_deployment.tpl
new file mode 100644 (file)
index 0000000..cf2d936
--- /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 (file)
index f98fa98..0000000
--- 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 0bb9467444c75c5804d592ee11b47b749ba551bd..e665213e127b4d5b40f01e40aeebd67dd6ef1b90 100644 (file)
--- 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}" />\r
        </target>\r
        \r
-       <!-- Run sampler deployment test -->\r
-       <target name="integration-test-sampler">\r
-               <fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-sampler.html" />\r
+       <!-- Run basic address book test -->\r
+       <target name="integration-test-addressbook">\r
+               <fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-addressbook.html" />\r
                <pathconvert pathsep=" " property="testfiles" refid="html-test-files" />\r
                \r
                <subant target="run-tests" failonerror="false" antfile="test.xml">\r
@@ -62,7 +62,7 @@
        <!-- Start and stop methods for servers -->\r
        <target name="integration-test-start-tomcat-4">\r
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-tomcat-4.1.40" />\r
-               <copy file="integration-testscripts/common/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-tomcat-4.1.40-sampler.html" overwrite="true" />\r
+               <copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-tomcat-4.1.40-addressbook.html" overwrite="true" />\r
        </target>\r
 \r
        <target name="integration-test-stop-tomcat-4">\r
@@ -71,7 +71,7 @@
        \r
        <target name="integration-test-start-tomcat-5">\r
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-tomcat-5.5.28" />\r
-               <copy file="integration-testscripts/common/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-tomcat-5.5.28-sampler.html" overwrite="true" />\r
+               <copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-tomcat-5.5.28-addressbook.html" overwrite="true" />\r
        </target>\r
 \r
        <target name="integration-test-stop-tomcat-5">\r
@@ -80,7 +80,7 @@
        \r
        <target name="integration-test-start-tomcat-6">\r
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-tomcat-6.0.20" />\r
-               <copy file="integration-testscripts/common/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-tomcat-6.0.20-sampler.html" overwrite="true" />\r
+               <copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-tomcat-6.0.20-addressbook.html" overwrite="true" />\r
        </target>\r
 \r
        <target name="integration-test-stop-tomcat-6">\r
@@ -89,7 +89,7 @@
        \r
        <target name="integration-test-start-jetty-5">\r
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jetty-5.1.15" />\r
-               <copy file="integration-testscripts/common/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-jetty-5.1.15-sampler.html" overwrite="true" />\r
+               <copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-jetty-5.1.15-addressbook.html" overwrite="true" />\r
        </target>\r
 \r
        <target name="integration-test-stop-jetty-5">\r
@@ -98,7 +98,7 @@
 \r
        <target name="integration-test-start-jetty-6">\r
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jetty-6.1.22" />\r
-               <copy file="integration-testscripts/common/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-jetty-6.1.22-sampler.html" overwrite="true" />\r
+               <copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-jetty-6.1.22-addressbook.html" overwrite="true" />\r
        </target>\r
 \r
        <target name="integration-test-stop-jetty-6">\r
@@ -107,7 +107,7 @@
        \r
        <target name="integration-test-start-jetty-7">\r
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jetty-7.0.0" />\r
-               <copy file="integration-testscripts/common/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-jetty-7.0.0-sampler.html" overwrite="true" />\r
+               <copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-jetty-7.0.0-addressbook.html" overwrite="true" />\r
        </target>\r
 \r
        <target name="integration-test-stop-jetty-7">\r
@@ -116,7 +116,7 @@
        \r
        <target name="integration-test-start-jboss-3">\r
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jboss-3.2.8" />\r
-               <copy file="integration-testscripts/common/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-jboss-3.2.8-sampler.html" overwrite="true" />\r
+               <copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-jboss-3.2.8-addressbook.html" overwrite="true" />\r
        </target>\r
 \r
        <target name="integration-test-stop-jboss-3">\r
@@ -125,7 +125,7 @@
        \r
        <target name="integration-test-start-jboss-4">\r
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jboss-4.2.3" />\r
-               <copy file="integration-testscripts/common/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-jboss-4.2.3-sampler.html" overwrite="true" />\r
+               <copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-jboss-4.2.3-addressbook.html" overwrite="true" />\r
        </target>\r
 \r
        <target name="integration-test-stop-jboss-4">\r
@@ -134,7 +134,7 @@
        \r
        <target name="integration-test-start-jboss-5">\r
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-jboss-5.0.1" />\r
-               <copy file="integration-testscripts/common/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-jboss-5.0.1-sampler.html" overwrite="true" />\r
+               <copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-jboss-5.0.1-addressbook.html" overwrite="true" />\r
        </target>\r
 \r
        <target name="integration-test-stop-jboss-5">\r
@@ -143,7 +143,7 @@
        \r
        <target name="integration-test-start-glassfish2">\r
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-glassfish-2.1.1" />\r
-               <copy file="integration-testscripts/common/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-glassfish-2.1.1-sampler.html" overwrite="true" />\r
+               <copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-glassfish-2.1.1-addressbook.html" overwrite="true" />\r
        </target>\r
        \r
        <target name="integration-test-stop-glassfish2">\r
@@ -152,7 +152,7 @@
        \r
        <target name="integration-test-start-glassfish3">\r
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-glassfish-3" />\r
-               <copy file="integration-testscripts/common/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-glassfish-3-sampler.html" overwrite="true" />\r
+               <copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-glassfish-3-addressbook.html" overwrite="true" />\r
        </target>\r
        \r
        <target name="integration-test-stop-glassfish3">\r
@@ -369,9 +369,9 @@
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-eXo-3.0.3" />\r
        </target>\r
        \r
-       <!-- Run sampler deployment test for WebLogic server -->\r
+       <!-- Run address book test for WebLogic server -->\r
        <target name="integration-test-test-weblogic">\r
-               <fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-sampler.html" />\r
+               <fileset dir="integration-testscripts" id="html-test-files" includes="integration-test-${server-name}-addressbook.html" />\r
                <pathconvert pathsep=" " property="test-weblogic" refid="html-test-files" />\r
                \r
                <subant target="run-tests" failonerror="false" antfile="test.xml">\r
@@ -389,7 +389,7 @@
        \r
        <target name="integration-test-start-weblogic9">\r
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-weblogic-9.2" />\r
-               <copy file="integration-testscripts/common/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-weblogic-9.2-sampler.html" overwrite="true" />\r
+               <copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-weblogic-9.2-addressbook.html" overwrite="true" />\r
        </target>\r
 \r
        <target name="integration-test-stop-weblogic9">\r
@@ -398,7 +398,7 @@
        \r
        <target name="integration-test-start-weblogic10">\r
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-weblogic-10.3" />\r
-               <copy file="integration-testscripts/common/sampler_deployment.tpl" tofile="integration-testscripts/integration-test-weblogic-10.3-sampler.html" overwrite="true" />\r
+               <copy file="integration-testscripts/common/addressbook_deployment.tpl" tofile="integration-testscripts/integration-test-weblogic-10.3-addressbook.html" overwrite="true" />\r
        </target>\r
 \r
        <target name="integration-test-stop-weblogic10">\r
@@ -438,7 +438,7 @@
        <!-- Server setup, test and teardown targets. -->\r
        <target name="integration-test-tomcat4">\r
                <antcall target="integration-test-start-tomcat-4"/>\r
-               <antcall target="integration-test-sampler">\r
+               <antcall target="integration-test-addressbook">\r
                        <param name="server-name" value="tomcat-4.1.40" />\r
                </antcall>\r
                <antcall target="integration-test-stop-tomcat-4"/>\r
@@ -446,7 +446,7 @@
        \r
        <target name="integration-test-tomcat5">\r
                <antcall target="integration-test-start-tomcat-5"/>\r
-               <antcall target="integration-test-sampler">\r
+               <antcall target="integration-test-addressbook">\r
                        <param name="server-name" value="tomcat-5.5.28" />\r
                </antcall>\r
                <antcall target="integration-test-stop-tomcat-5"/>\r
@@ -454,7 +454,7 @@
        \r
        <target name="integration-test-tomcat6">\r
                <antcall target="integration-test-start-tomcat-6"/>\r
-               <antcall target="integration-test-sampler">\r
+               <antcall target="integration-test-addressbook">\r
                        <param name="server-name" value="tomcat-6.0.20" />\r
                </antcall>\r
                <antcall target="integration-test-stop-tomcat-6"/>\r
@@ -462,7 +462,7 @@
        \r
        <target name="integration-test-jetty5">\r
                <antcall target="integration-test-start-jetty-5"/>\r
-               <antcall target="integration-test-sampler">\r
+               <antcall target="integration-test-addressbook">\r
                        <param name="server-name" value="jetty-5.1.15" />\r
                </antcall>\r
                <antcall target="integration-test-stop-jetty-5"/>\r
@@ -470,7 +470,7 @@
        \r
        <target name="integration-test-jetty6">\r
                <antcall target="integration-test-start-jetty-6"/>\r
-               <antcall target="integration-test-sampler">\r
+               <antcall target="integration-test-addressbook">\r
                        <param name="server-name" value="jetty-6.1.22" />\r
                </antcall>\r
                <antcall target="integration-test-stop-jetty-6"/>\r
@@ -478,7 +478,7 @@
        \r
        <target name="integration-test-jetty7">\r
                <antcall target="integration-test-start-jetty-7"/>\r
-               <antcall target="integration-test-sampler">\r
+               <antcall target="integration-test-addressbook">\r
                        <param name="server-name" value="jetty-7.0.0" />\r
                </antcall>\r
                <antcall target="integration-test-stop-jetty-7"/>\r
@@ -486,7 +486,7 @@
        \r
        <target name="integration-test-jboss3">\r
                <antcall target="integration-test-start-jboss-3"/>\r
-               <antcall target="integration-test-sampler">\r
+               <antcall target="integration-test-addressbook">\r
                        <param name="server-name" value="jboss-3.2.8" />\r
                </antcall>\r
                <antcall target="integration-test-stop-jboss-3"/>\r
@@ -494,7 +494,7 @@
        \r
        <target name="integration-test-jboss4">\r
                <antcall target="integration-test-start-jboss-4"/>\r
-               <antcall target="integration-test-sampler">\r
+               <antcall target="integration-test-addressbook">\r
                        <param name="server-name" value="jboss-4.2.3" />\r
                </antcall>\r
                <antcall target="integration-test-stop-jboss-4"/>\r
@@ -502,7 +502,7 @@
        \r
        <target name="integration-test-jboss5">\r
                <antcall target="integration-test-start-jboss-5"/>\r
-               <antcall target="integration-test-sampler">\r
+               <antcall target="integration-test-addressbook">\r
                        <param name="server-name" value="jboss-5.0.1" />\r
                </antcall>\r
                <antcall target="integration-test-stop-jboss-5"/>\r
@@ -510,7 +510,7 @@
                \r
        <target name="integration-test-glassfish2">\r
                <antcall target="integration-test-start-glassfish2"/>\r
-               <antcall target="integration-test-sampler">\r
+               <antcall target="integration-test-addressbook">\r
                        <param name="server-name" value="glassfish-2.1.1" />\r
                </antcall>\r
                <antcall target="integration-test-stop-glassfish2"/>\r
@@ -518,7 +518,7 @@
        \r
        <target name="integration-test-glassfish3">\r
                <antcall target="integration-test-start-glassfish3"/>\r
-               <antcall target="integration-test-sampler">\r
+               <antcall target="integration-test-addressbook">\r
                        <param name="server-name" value="glassfish-3" />\r
                </antcall>\r
                <antcall target="integration-test-stop-glassfish3"/>\r
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework