Updated tests for gateIn3 and liferay6

svn changeset:14740/svn branch:6.4

diff --git a/tests/integration-testscripts/integration-test-GateIn-3.1.0-sampler.html b/tests/integration-testscripts/integration-test-GateIn-3.1.0-sampler.html
index c9b5c167703299fa67f68739c376e996be4bb9db..182172a407a82b151c55a7f9e28976651aff999e 100644 (file)
--- a/tests/integration-testscripts/integration-test-GateIn-3.1.0-sampler.html
+++ b/tests/integration-testscripts/integration-test-GateIn-3.1.0-sampler.html
@@ -122,20 +122,25 @@
        <td>13,5</td>
 </tr>
 <tr>
-       <td>screenCapture</td>
-       <td></td>
-       <td></td>
+       <td>mouseClick</td>
+       <td>vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[5]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td>
+       <td>22,-1763</td>
 </tr>
 <tr>
        <td>mouseClick</td>
-       <td>//div[@id='demosampler-624716997']/div/div[2]/div/div[2]/div/div/div/div[1]/div/div[2]/div/div/div/div[8]/div/div/div[7]/a/span</td>
-       <td>22,-1763</td>
+       <td>vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[6]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td>
+       <td>20,13</td>
 </tr>
 <tr>
-       <td>waitForVaadin</td>
+       <td>screenCapture</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>21,12</td>
+</tr>
 <tr>
        <td>screenCapture</td>
        <td></td>

diff --git a/tests/integration-testscripts/integration-test-liferay-6.0.5.html b/tests/integration-testscripts/integration-test-liferay-6.0.5.html
index c17647a604a18d294c06f063a1f09a57c91f49ae..17cdabb52098987999440987b19fd3817aea5acb 100644 (file)
--- a/tests/integration-testscripts/integration-test-liferay-6.0.5.html
+++ b/tests/integration-testscripts/integration-test-liferay-6.0.5.html
@@ -121,6 +121,31 @@
        <td></td>
        <td></td>
 </tr>
+<tr>
+       <td>mouseClick</td>
+       <td>vaadin=demosampler::/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[5]/VHorizontalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td>
+       <td>16,11</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>23,12</td>
+</tr>
+<tr>
+       <td>screenCapture</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>10,10</td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td></td>
+</tr>
 
 </tbody></table>
 </body>

diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index cefa1523208f9474a081f8024c52f167d6a0e312..206048409bc329a839be3ff12707020765abc4e5 100644 (file)
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -255,12 +255,12 @@
        </target>\r
        \r
        <target name="integration-test-start-liferay-6">\r
-               <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-liferay-6.0.5" />\r
+               <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-liferay-6.0.5" />\r
                <copy file="integration-testscripts/integration-test-liferay-6.0.5.html" tofile="integration-testscripts/integration-test-liferay-6.0.5-sampler.html" overwrite="true" />\r
        </target>\r
 \r
        <target name="integration-test-stop-liferay-6">\r
-               <sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-liferay-6.0.5" />\r
+               <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-liferay-6.0.5" />\r
        </target>\r
                        \r
        <target name="integration-test-start-gatein-3">\r