2 files changed, 34 insertions, 19 deletions
diff --git a/tests/integration-testscripts/eXo-3/integration-test-eXo-3.0.3-addressbook.html b/tests/integration-testscripts/eXo-3/integration-test-eXo-3.0.3-portlet2.html
index 10bd1e2922..e58c47c969 100644
--- a/tests/integration-testscripts/eXo-3/integration-test-eXo-3.0.3-addressbook.html
+++ b/tests/integration-testscripts/eXo-3/integration-test-eXo-3.0.3-portlet2.html
@@ -4,12 +4,12 @@
 <head profile="http://selenium-ide.openqa.org/profiles/test-case">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 <link rel="selenium.base" href="http://vaadin-integration-tests.intra.itmill.com:8080/" />
-<title>eXo-integration</title>
+<title>integration-test-eXo-3.0.3-portlet2</title>
 </head>
 <body>
 <table cellpadding="1" cellspacing="1" border="1">
 <thead>
-<tr><td rowspan="1" colspan="3">eXo-integration</td></tr>
+<tr><td rowspan="1" colspan="3">integration-test-eXo-3.0.3-portlet2</td></tr>
 </thead><tbody>
 <tr>
 	<td>open</td>
@@ -118,12 +118,12 @@
 </tr>
 <tr>
 	<td>waitForElementPresent</td>
-	<td>//div[@id='demo/AddressBookPortlet']/div/div/div[1]/div[1]</td>
+	<td>//div[@id='demo/JSR286TestPortlet']/div/div/div[1]/div[1]</td>
 	<td></td>
 </tr>
 <tr>
 	<td>drag</td>
-	<td>//div[@id='demo/AddressBookPortlet']/div/div/div[1]/div[2]</td>
+	<td>//div[@id='demo/JSR286TestPortlet']/div/div/div[1]/div[2]</td>
 	<td>147,6</td>
 </tr>
 <tr>
@@ -137,44 +137,59 @@
 	<td>760,138</td>
 </tr>
 <tr>
-	<td>mouseClick</td>
+	<td>mouseClickAndWait</td>
 	<td>//a[@onclick='eXo.core.DOMUtil.disableOnClick(this);']</td>
 	<td>10,7</td>
 </tr>
 <tr>
+	<td>closeNotification</td>
+	<td>//body/div[4]</td>
+	<td>0,0</td>
+</tr>
+<tr>
 	<td>setTimeout</td>
 	<td>60000</td>
 	<td></td>
 </tr>
 <tr>
-	<td>waitForElementPresent</td>
-	<td>//tr[3]/td[1]/div</td>
-	<td></td>
+	<td>mouseClickAndWait</td>
+	<td>//div[@id='UIPage']/div/div/div[2]/div/div/div/div/div/div/div[2]/div/div[3]/div/div/a</td>
+	<td>10,10</td>
 </tr>
 <tr>
-	<td>pause</td>
-	<td>500</td>
-	<td></td>
+	<td>closeNotification</td>
+	<td>//body/div[4]</td>
+	<td>0,0</td>
 </tr>
 <tr>
-	<td>mouseClick</td>
-	<td>//tr[3]/td[1]/div</td>
-	<td>64,15</td>
+	<td>pause</td>
+	<td>1000</td>
+	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
-	<td>Marge_selected</td>
+	<td>Edit_mode</td>
 </tr>
 <tr>
-	<td>click</td>
-	<td>//div[4]/div/div/div[3]/div/div/span</td>
+	<td>mouseClickAndWait</td>
+	<td>//div[@id='UIPage']/div/div/div[2]/div/div/div/div/div/div/div[2]/div/div[3]/div/div/a</td>
+	<td>15,8</td>
+</tr>
+<tr>
+	<td>closeNotification</td>
+	<td>//body/div[4]</td>
+	<td>0,0</td>
+</tr>
+<tr>
+	<td>pause</td>
+	<td>1000</td>
 	<td></td>
 </tr>
 <tr>
 	<td>screenCapture</td>
 	<td></td>
-	<td>Marge_in_edit_mode</td>
+	<td>done</td>
 </tr>
 
 </tbody></table>
diff --git a/tests/integration_tests.xml b/tests/integration_tests.xml
index 7eb1e5bacb..f947059607 100644
--- a/tests/integration_tests.xml
+++ b/tests/integration_tests.xml
@@ -261,7 +261,7 @@
 	</target>
 	
 	<target name="integration-test-eXo-3">
-		<fileset dir="integration-testscripts" id="html-test-files" includes="eXo-3/integration-test-eXo-3.0.3-addressbook.html" />
+		<fileset dir="integration-testscripts" id="html-test-files" includes="eXo-3/integration-test-eXo-3.0.3-portlet2.html" />
 		<pathconvert pathsep=" " property="test-exo" refid="html-test-files" />
 		
 		<subant target="run-tests" failonerror="false" antfile="test.xml">