Integration test functionality update. Fixed integration sampler test targets.

svn changeset:13743/svn branch:6.4

diff --git a/tests/integration-testscripts/sampler_deployment.tpl b/tests/integration-testscripts/sampler_deployment.tpl
index d2ff9ad4dad3e3b1657cd603a8986dbd410d8329..f7f6839a966b9b80da6bdacfffd317f27ab9df82 100644 (file)
--- a/tests/integration-testscripts/sampler_deployment.tpl
+++ b/tests/integration-testscripts/sampler_deployment.tpl
@@ -39,7 +39,7 @@
 <!--Start scrolling through all samples in order-->
 <tr>
        <td>mouseClick</td>
-       <td>vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[6]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</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>
@@ -49,7 +49,7 @@
 </tr>
 <tr>
        <td>mouseClick</td>
-       <td>vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[7]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</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>
@@ -69,7 +69,7 @@
 </tr>
 <tr>
        <td>mouseClick</td>
-       <td>vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[7]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</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>

diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index cbf995f207dc8f10fce470edaab53a05d8891a45..caeba8a0a60751f2a030d0f97423da4aa0254dae 100644 (file)
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -164,6 +164,7 @@
                        <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="server.start.succeeded" value="1" />\r
                        <property name="browsers" value="${test_browsers}" />\r
                        <property name="testfiles" value="${test-liferay}" />\r
                        \r
@@ -180,6 +181,7 @@
                        <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="server.start.succeeded" value="1" />\r
                        <property name="browsers" value="winxp-firefox36" />\r
                        <property name="testfiles" value="${init-liferay}" />\r
        \r
@@ -205,6 +207,7 @@
                        <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="server.start.succeeded" value="1" />\r
                        <property name="browsers" value="${test_browsers}" />\r
                        <property name="testfiles" value="${test-weblogic}" />\r
                        \r
@@ -239,6 +242,7 @@
                        <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://vaadin-integration-test.appspot.com/" />\r
+                       <property name="server.start.succeeded" value="1" />\r
                        <property name="browsers" value="${test_browsers}" />\r
                        <property name="testfiles" value="${test-GAE}" />\r
                        \r
@@ -369,36 +373,72 @@
                        \r
        <!-- Upload demo, clean error screenshots and test deployment on all servers -->\r
        <target name="integration-test-all">\r
-               <antcall target="integration-test-upload-demo" />\r
-               <echo>Getting lock</echo>\r
+               <echo message="Getting lock" />\r
                <antcall target="integration-test-get-lock" />\r
-               <echo>Got lock</echo>\r
+               <echo message="Got lock" />\r
+               \r
+               <antcall target="integration-test-upload-demo" />\r
+               \r
+               <antcall target="run-integration-test">\r
+                       <param name="target-server" value="tomcat4"/>\r
+               </antcall>\r
+               <antcall target="run-integration-test">\r
+                       <param name="target-server" value="tomcat5"/>\r
+               </antcall>\r
+               <antcall target="run-integration-test">\r
+                       <param name="target-server" value="tomcat6"/>\r
+               </antcall>\r
+               <antcall target="run-integration-test">\r
+                       <param name="target-server" value="jetty5"/>\r
+               </antcall>\r
+               <antcall target="run-integration-test">\r
+                       <param name="target-server" value="jetty6"/>\r
+               </antcall>\r
+               <antcall target="run-integration-test">\r
+                       <param name="target-server" value="jetty7"/>\r
+               </antcall>\r
+               <antcall target="run-integration-test">\r
+                       <param name="target-server" value="jboss3"/>\r
+               </antcall>\r
+               <antcall target="run-integration-test">\r
+                       <param name="target-server" value="jboss4"/>\r
+               </antcall>\r
+               <antcall target="run-integration-test">\r
+                       <param name="target-server" value="jboss5"/>\r
+               </antcall>\r
+               <antcall target="run-integration-test">\r
+                       <param name="target-server" value="glassfish2"/>\r
+               </antcall>\r
+               <antcall target="run-integration-test">\r
+                       <param name="target-server" value="glassfish3"/>\r
+               </antcall>\r
+               <antcall target="run-integration-test">\r
+                       <param name="target-server" value="liferay"/>\r
+               </antcall>\r
+               <antcall target="run-integration-test">\r
+                       <param name="target-server" value="weblogic9"/>\r
+               </antcall>\r
+               <antcall target="run-integration-test">\r
+                       <param name="target-server" value="weblogic10"/>\r
+               </antcall>\r
+               <antcall target="run-integration-test">\r
+                       <param name="target-server" value="GAE"/>\r
+               </antcall>\r
+\r
+               <antcall target="integration-test-clean" />\r
+               <echo message="Getting lock" />\r
+               <antcall target="integration-test-release-lock" />\r
+               <echo message="Lock released" />\r
+       </target>\r
+       \r
+       <target name="run-integration-test">\r
                <trycatch property="tried">\r
                        <try>\r
-                               <antcall target="integration-test-tomcat4" />\r
-                               <antcall target="integration-test-tomcat5" />\r
-                               <antcall target="integration-test-tomcat6" />\r
-                               <antcall target="integration-test-jetty5" />\r
-                               <antcall target="integration-test-jetty6" />\r
-                               <antcall target="integration-test-jetty7" />\r
-                               <antcall target="integration-test-jboss3" />\r
-                               <antcall target="integration-test-jboss4" />\r
-                               <antcall target="integration-test-jboss5" />\r
-                               <antcall target="integration-test-glassfish2" />\r
-                               <antcall target="integration-test-glassfish3" />\r
-                               <antcall target="integration-test-liferay" />\r
-                               <antcall target="integration-test-weblogic9" />\r
-                               <antcall target="integration-test-weblogic10" />\r
-                               <antcall target="integration-test-GAE" />\r
+                               <antcall target="integration-test-${target-server}" />\r
                        </try>\r
                        <catch>\r
-                               <echo>${tried}</echo>\r
-                               <echo>Running targets: integration-test-clean and integration-test-release-lock</echo>\r
+                               <echo message="##teamcity[testFailed name='${target-server}' message='Integration test for ${target-server} failed.' details='${tried}']" />\r
                        </catch>\r
-                       <finally>\r
-                               <antcall target="integration-test-clean" />\r
-                               <antcall target="integration-test-release-lock" />\r
-                       </finally>\r
                </trycatch>\r
        </target>\r
        \r