From 0dbe5989a8c503bbe878bce20c9fe3ad1725f45e Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Fri, 15 Mar 2013 14:56:09 +0200
Subject: Made test more reliable

Change-Id: Ibd93d834abaa1ec2ba322ab4ca9f53944cfe9519
---
 .../integration-test-GateIn-3.1.0-portlet2.html    | 73 +++++++++++++++++-----
 1 file changed, 59 insertions(+), 14 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 9ae3865815..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
@@ -16,11 +16,6 @@
 	<td>/portal/public/classic/</td>
 	<td></td>
 </tr>
-<tr>
-	<td>setSpeed</td>
-	<td>100</td>
-	<td>100</td>
-</tr>
 <tr>
 	<td>mouseClickAndWait</td>
 	<td>link=Administrator</td>
@@ -32,50 +27,95 @@
 	<td>93,13</td>
 </tr>
 <tr>
-	<td>mouseClickAndWait</td>
+	<td>mouseClick</td>
 	<td>link=Portlet</td>
 	<td>33,11</td>
 </tr>
 <tr>
-	<td>mouseClickAndWait</td>
+	<td>waitForElementPresent</td>
 	<td>link=Vaadin Portlet 2.0 Test</td>
 	<td>59,9</td>
 </tr>
 <tr>
-	<td>mouseClickAndWait</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>mouseClickAndWait</td>
+	<td>waitForElementPresent</td>
+	<td>name=category_Gadgets</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
 	<td>name=category_Gadgets</td>
 	<td>10,16</td>
 </tr>
 <tr>
-	<td>mouseClickAndWait</td>
+	<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>mouseClickAndWait</td>
+	<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>mouseClickAndWait</td>
+	<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>mouseClickAndWait</td>
+	<td>waitForElementPresent</td>
 	<td>name=category_Gadgets</td>
 	<td>7,12</td>
 </tr>
 <tr>
-	<td>mouseClickAndWait</td>
+	<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>
 	<td>link=Add New Page</td>
@@ -127,6 +167,11 @@
 	<td>//div[2]/div/div/div[1]/div/div[2]/div/div/div/div</td>
 	<td>113,9</td>
 </tr>
+<tr>
+	<td>waitForTextPresent</td>
+	<td>Vaadin Portlet 2.0 Test</td>
+	<td></td>
+</tr>
 <!--Switch to view mode-->
 <tr>
 	<td>mouseClickAndWait</td>
-- 
cgit v1.2.3