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 792555277fa749d9606d1416109f1c58b081ce80..88cac6cd749a3f77eb60704f9bca68cc1d8be6cd 100644 (file)
--- 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 ef96c2d17fc987ebbf74a5352c206f03153ea3c3..5b9fd3a57d75760eab00009c5c11cbe44bd2b0a7 100644 (file)
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -278,6 +278,15 @@
        <target name="integration-test-stop-liferay-6">\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-liferay-6ee">\r
+               <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-liferay-6.0-ee" />\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-6ee">\r
+               <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} stop-liferay-6.0-ee" />\r
+       </target>\r
                        \r
        <target name="integration-test-start-gatein-3">\r
                <sshexec host="${test.integration.server}" username="${user}" keyfile="${sshkey.file}" command="ant -f ${ant.hub} start-gatein-3.1.0" />\r
@@ -456,6 +465,13 @@
                <antcall target="integration-test-stop-liferay-6" />\r
        </target>\r
        \r
+       <target name="integration-test-liferay6ee">\r
+               <antcall target="integration-test-start-liferay-6ee" />\r
+               <!--<antcall target="integration-test-liferay-6" />-->\r
+               <antcall target="test-theme-liferay-6" />\r
+               <antcall target="integration-test-stop-liferay-6ee" />\r
+       </target>\r
+       \r
        <target name="integration-test-gatein3">\r
                <antcall target="integration-test-start-gatein-3" />\r
                <antcall target="integration-test-gatein-3" />\r
@@ -532,6 +548,9 @@
                                <antcall target="run-integration-test">\r
                                        <param name="target-server" value="liferay6"/>\r
                                </antcall>\r
+                               <antcall target="run-integration-test">\r
+                                       <param name="target-server" value="liferay6ee"/>\r
+                               </antcall>\r
                                <antcall target="run-integration-test">\r
                                        <param name="target-server" value="gatein3"/>\r
                                </antcall>\r