Merge commit 'e4c9eda51082a443822b66864df2fe14be7dc6d7'

Conflicts:
	uitest/test.xml

Change-Id: I2c82fa7117b21bddad313abdd2f3f43143317c12

1 files changed, 90 insertions, 58 deletions

diff --git a/uitest/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-portlet2.html b/uitest/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-portlet2.html
index 4bc3e6a2cf..5d2d4c3445 100644
--- a/uitest/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-portlet2.html
+++ b/uitest/integration-testscripts/GateIn-3/integration-test-GateIn-3.1.0-portlet2.html
@@ -17,11 +17,6 @@
 	<td></td>
 </tr>
 <tr>
-	<td>setSpeed</td>
-	<td>100</td>
-	<td>100</td>
-</tr>
-<tr>
 	<td>mouseClickAndWait</td>
 	<td>link=Administrator</td>
 	<td>27,7</td>
@@ -32,24 +27,94 @@
 	<td>93,13</td>
 </tr>
 <tr>
-	<td>expectDialog</td>
-	<td>//div[2]/div[2]/div[1]/div[1]/div[2]</td>
-	<td>73,18</td>
+	<td>mouseClick</td>
+	<td>link=Portlet</td>
+	<td>33,11</td>
+</tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>link=Vaadin Portlet 2.0 Test</td>
+	<td>59,9</td>
 </tr>
 <tr>
-	<td>assertConfirmation</td>
-	<td>This action will automatically create categories and import all the gadgets and portlets on it.</td>
+	<td>mouseClick</td>
+	<td>link=Vaadin Portlet 2.0 Test</td>
+	<td>59,9</td>
+</tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>link=Click here to add into categories</td>
 	<td></td>
 </tr>
 <tr>
+	<td>mouseClick</td>
+	<td>link=Click here to add into categories</td>
+	<td>48,3</td>
+</tr>
+<tr>
 	<td>waitForElementPresent</td>
-	<td>link=demo</td>
+	<td>name=category_Gadgets</td>
 	<td></td>
 </tr>
 <tr>
-	<td>mouseClickAndWait</td>
-	<td>link=Home</td>
-	<td>65,18</td>
+	<td>mouseClick</td>
+	<td>name=category_Gadgets</td>
+	<td>10,16</td>
+</tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>link=Save</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>link=Save</td>
+	<td>4,6</td>
+</tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>link=Vaadin Liferay Theme</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>link=Vaadin Liferay Theme</td>
+	<td>64,13</td>
+</tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>link=Click here to add into categories</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>link=Click here to add into categories</td>
+	<td>96,9</td>
+</tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>name=category_Gadgets</td>
+	<td>7,12</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>name=category_Gadgets</td>
+	<td>7,12</td>
+</tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>link=Save</td>
+	<td>4,6</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>link=Save</td>
+	<td>4,6</td>
+</tr>
+<tr>
+	<td>waitForElementPresent</td>
+	<td>link=Add New Page</td>
+	<td>55,11</td>
 </tr>
 <tr>
 	<td>mouseClick</td>
@@ -86,24 +151,15 @@
 	<td>//div[@id='UIPageCreationWizard']/div/div[3]/div/div/div/div[2]/div/table/tbody/tr/td/div[2]/div/div/div</td>
 	<td>21,13</td>
 </tr>
+<!--Drag JSR286 test portlet to page-->
 <tr>
 	<td>waitForElementPresent</td>
-	<td>//div[@id='UIPageEditor']/div[1]/div/div/div/div[2]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>mouseClick</td>
-	<td>//div[@onclick=&quot;javascript:ajaxGet('/portal/private/classic/home?portal:componentId=UIApplicationList&amp;portal:action=SelectCategory&amp;objectId=demo&amp;ajaxRequest=true')&quot;]</td>
-	<td>51,11</td>
-</tr>
-<tr>
-	<td>pause</td>
-	<td>300</td>
+	<td>//div[@id='Gadgets/JSR286TestPortlet']/div/div/div/div</td>
 	<td></td>
 </tr>
 <tr>
 	<td>drag</td>
-	<td>//div[@id='demo/JSR286TestPortlet']/div/div/div[1]/div[2]</td>
+	<td>//div[@id='Gadgets/JSR286TestPortlet']/div/div/div/div</td>
 	<td></td>
 </tr>
 <tr>
@@ -112,49 +168,25 @@
 	<td>113,9</td>
 </tr>
 <tr>
-	<td>mouseClickAndWait</td>
-	<td>//a[@onclick='eXo.core.DOMUtil.disableOnClick(this);']</td>
-	<td>13,5</td>
-</tr>
-<tr>
-	<td>mouseClickAndWait</td>
-	<td>//div[@id='UIPage']/div/div/div[2]/div/div/div/div/div/div/div[2]/div[5]/div/a</td>
-	<td>10,10</td>
-</tr>
-<tr>
-	<td>closeNotification</td>
-	<td>//body/div[2]</td>
-	<td>0,0</td>
-</tr>
-<tr>
-	<td>pause</td>
-	<td>500</td>
+	<td>waitForTextPresent</td>
+	<td>Vaadin Portlet 2.0 Test</td>
 	<td></td>
 </tr>
-<tr>
-	<td>screenCapture</td>
-	<td></td>
-	<td>Edit_mode</td>
-</tr>
+<!--Switch to view mode-->
 <tr>
 	<td>mouseClickAndWait</td>
-	<td>//div[@id='UIPage']/div/div/div[2]/div/div/div/div/div/div/div[2]/div[5]/div/a</td>
-	<td>15,8</td>
-</tr>
-<tr>
-	<td>closeNotification</td>
-	<td>//body/div[2]</td>
-	<td>0,0</td>
+	<td>//a[@onclick='eXo.core.DOMUtil.disableOnClick(this);']</td>
+	<td>13,5</td>
 </tr>
 <tr>
-	<td>pause</td>
-	<td>500</td>
+	<td>waitForElementPresent</td>
+	<td>//div[2]/div/div[2]/img</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
-	<td>done</td>
+	<td>view</td>
 </tr>
 </tbody></table>
 </body>