From: Henri Kerola <henri.kerola@itmill.com>
Date: Fri, 1 Oct 2010 13:42:28 +0000 (+0000)
Subject: Integration test for Liferay 6 EE (CE and EE use the same TB test)
X-Git-Tag: 6.7.0.beta1~1007^2~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a8a97eeb832e4992d229181347c8fa70df5dce85;p=vaadin-framework.git

Integration test for Liferay 6 EE (CE and EE use the same TB test)

svn changeset:15298/svn branch:6.4
---

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 792555277f..88cac6cd74 100644
--- a/tests/integration-testscripts/integration-test-liferay-6.0.5.html
+++ b/tests/integration-testscripts/integration-test-liferay-6.0.5.html
@@ -18,8 +18,40 @@
 </tr>
 <tr>
 	<td>mouseClickAndWait</td>
-	<td>link=Login as bruno</td>
-	<td>50,5</td>
+	<td>sign-in</td>
+	<td>49,17</td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>_58_login</td>
+	<td>test@liferay.com</td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>_58_password</td>
+	<td>test</td>
+</tr>
+<tr>
+	<td>mouseClickAndWait</td>
+	<td>//input[@value='Sign In']</td>
+	<td>43,18</td>
+</tr>
+
+<!--  -->
+<tr>
+	<td>mouseClickAndWait</td>
+	<td>//input[@type='submit']</td>
+	<td>16,-1321</td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>reminderQueryAnswer</td>
+	<td>-</td>
+</tr>
+<tr>
+	<td>mouseClickAndWait</td>
+	<td>//input[@value='Save']</td>
+	<td>86,13</td>
 </tr>
 <tr>
 	<td>drag</td>
@@ -103,17 +135,12 @@
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
-	<td>//div[13]/h2/span</td>
+	<td>//div[@title='Vaadin Liferay Theme']/p/a</td>
 	<td></td>
 </tr>
 <tr>
 	<td>mouseClick</td>
-	<td>//div[13]/h2/span</td>
-	<td>35,10</td>
-</tr>
-<tr>
-	<td>mouseClick</td>
-	<td>//div[13]/div/div[9]/p/a</td>
+	<td>//div[@title='Vaadin Liferay Theme']/p/a</td>
 	<td>10,10</td>
 </tr>
 <tr>
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index ef96c2d17f..5b9fd3a57d 100644
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -278,6 +278,15 @@
 	<target name="integration-test-stop-liferay-6">
 		<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-liferay-6ee">
+		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-liferay-6.0-ee" />
+		<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-6ee">
+		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-liferay-6.0-ee" />
+	</target>
 			
 	<target name="integration-test-start-gatein-3">
 		<sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-gatein-3.1.0" />
@@ -456,6 +465,13 @@
 		<antcall target="integration-test-stop-liferay-6" />
 	</target>
 	
+	<target name="integration-test-liferay6ee">
+		<antcall target="integration-test-start-liferay-6ee" />
+		<!--<antcall target="integration-test-liferay-6" />-->
+		<antcall target="test-theme-liferay-6" />
+		<antcall target="integration-test-stop-liferay-6ee" />
+	</target>
+	
 	<target name="integration-test-gatein3">
 		<antcall target="integration-test-start-gatein-3" />
 		<antcall target="integration-test-gatein-3" />
@@ -532,6 +548,9 @@
 				<antcall target="run-integration-test">
 					<param name="target-server" value="liferay6"/>
 				</antcall>
+				<antcall target="run-integration-test">
+					<param name="target-server" value="liferay6ee"/>
+				</antcall>
 				<antcall target="run-integration-test">
 					<param name="target-server" value="gatein3"/>
 				</antcall>