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 00823cc62d69a9f716e9bb3391bd6c19d0f85396..6fb253fc10baddc1e7227ee8578d5372dabd1f8f 100644 (file)
--- a/tests/integration-testscripts/sampler_deployment.tpl
+++ b/tests/integration-testscripts/sampler_deployment.tpl
@@ -55,7 +55,7 @@
 <tr>\r
        <td>screenCapture</td>\r
        <td></td>\r
-       <td>@server@_1</td>\r
+       <td></td>\r
 </tr>\r
 <tr>\r
        <td>mouseClick</td>\r
@@ -75,7 +75,7 @@
 <tr>\r
        <td>screenCapture</td>\r
        <td></td>\r
-       <td>@server@_2</td>\r
+       <td></td>\r
 </tr>\r
 \r
 </tbody></table>\r

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