#7178 replaced most demo portlets with a test portlet, use it in Liferay 5 integration test

svn changeset:20276/svn branch:6.7

1 files changed, 62 insertions, 17 deletions

diff --git a/tests/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-portlet2.html b/tests/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-portlet2.html
index 29d63639b5..7b648d0157 100644
--- a/tests/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-portlet2.html
+++ b/tests/integration-testscripts/Liferay-5/integration-test-liferay-5.2.3-portlet2.html
@@ -78,7 +78,7 @@
 </tr>
 <tr>
 	<td>mouseClickAndWait</td>
-	<td>//div[@id='Vaadin-AddressBook']/p/a</td>
+	<td>//div[@id='Vaadin-VaadinPortlet20Test']/p/a</td>
 	<td>16,11</td>
 </tr>
 <tr>
@@ -92,34 +92,79 @@
 	<td></td>
 </tr>
 <tr>
-	<td>mouseClick</td>
-	<td>vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10707::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[0]/domChild[0]</td>
-	<td>24,10</td>
+	<td>closeNotification</td>
+	<td>//body/div[2]</td>
+	<td></td>
 </tr>
 <tr>
-	<td>click</td>
-	<td>vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10707::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td>verifyTextNotPresent</td>
+	<td>Action received</td>
 	<td></td>
 </tr>
 <tr>
-	<td>mouseClick</td>
-	<td>vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10707::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]/domChild[1]</td>
-	<td>9,11</td>
+	<td>mouseClickAndWait</td>
+	<td>vaadin=v-JSR286TestPortlet_WAR_demo_LAYOUT_10706::/VVerticalLayout[0]/ChildComponentContainer[2]/VLink[0]/domChild[0]/domChild[0]</td>
+	<td>8,7</td>
 </tr>
 <tr>
-	<td>mouseClick</td>
-	<td>vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10707::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item8</td>
-	<td>158,17</td>
+	<td>closeNotification</td>
+	<td>//body/div[2]</td>
+	<td>0,0</td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Done</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Action received</td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClickAndWait</td>
+	<td>vaadin=v-JSR286TestPortlet_WAR_demo_LAYOUT_10706::/VVerticalLayout[0]/ChildComponentContainer[4]/VLink[0]/domChild[0]/domChild[0]</td>
+	<td>28,7</td>
+</tr>
+<tr>
+	<td>closeNotification</td>
+	<td>//body/div[2]</td>
+	<td>0,0</td>
+</tr>
+<tr>
+	<td>mouseClickAndWait</td>
+	<td>vaadin=v-JSR286TestPortlet_WAR_demo_LAYOUT_10706::/VVerticalLayout[0]/ChildComponentContainer[3]/VLink[0]/domChild[0]/domChild[0]</td>
+	<td>37,-41</td>
 </tr>
 <tr>
-	<td>click</td>
-	<td>vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10707::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VForm[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td>closeNotification</td>
+	<td>//body/div[2]</td>
+	<td>0,0</td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Back to normal</td>
 	<td></td>
 </tr>
 <tr>
-	<td>assertText</td>
-	<td>vaadin=v-AddressBookPortlet_WAR_demo_LAYOUT_10707::/VVerticalLayout[0]/ChildComponentContainer[1]/VSplitPanelHorizontal[0]/VSplitPanelVertical[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[6]/domChild[0]</td>
-	<td>New York</td>
+	<td>mouseClickAndWait</td>
+	<td>vaadin=v-JSR286TestPortlet_WAR_demo_LAYOUT_10706::/VVerticalLayout[0]/ChildComponentContainer[3]/VLink[0]/domChild[0]/domChild[0]</td>
+	<td>46,-57</td>
+</tr>
+<tr>
+	<td>closeNotification</td>
+	<td>//body/div[2]</td>
+	<td>0,0</td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Edit</td>
+	<td></td>
+</tr>
+<tr>
+	<td>verifyTextPresent</td>
+	<td>Maximize</td>
+	<td></td>
 </tr>
 
 </tbody></table>