From b51fb68f04ee7297b585b9ec65d84bbf252f799e Mon Sep 17 00:00:00 2001
From: Mikael Grankvist <mikael.grankvist@itmill.com>
Date: Tue, 7 Sep 2010 10:36:52 +0000
Subject: [PATCH] Updated tests for gateIn3 and liferay6

svn changeset:14740/svn branch:6.4
---
 ...integration-test-GateIn-3.1.0-sampler.html | 17 ++++++++-----
 .../integration-test-liferay-6.0.5.html       | 25 +++++++++++++++++++
 tests/integration_tests.xml                   |  4 +--
 3 files changed, 38 insertions(+), 8 deletions(-)

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 c9b5c16770..182172a407 100644
--- 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 c17647a604..17cdabb520 100644
--- 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 cefa152320..206048409b 100644
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -255,12 +255,12 @@
 	</target>
 	
 	<target name="integration-test-start-liferay-6">
-		<sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-liferay-6.0.5" />
+		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-liferay-6.0.5" />
 		<copy file="integration-testscripts/integration-test-liferay-6.0.5.html" tofile="integration-testscripts/integration-test-liferay-6.0.5-sampler.html" overwrite="true" />
 	</target>
 
 	<target name="integration-test-stop-liferay-6">
-		<sshexec host="${sshHost}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-liferay-6.0.5" />
+		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-liferay-6.0.5" />
 	</target>
 			
 	<target name="integration-test-start-gatein-3">
-- 
2.39.5