Update some testbench selectors

2 files changed, 16 insertions, 16 deletions

diff --git a/tests/integration-testscripts/Liferay-6/Liferay6-theme.html b/tests/integration-testscripts/Liferay-6/Liferay6-theme.html
index 34919fe543..c61adb0dd7 100644
--- a/tests/integration-testscripts/Liferay-6/Liferay6-theme.html
+++ b/tests/integration-testscripts/Liferay-6/Liferay6-theme.html
@@ -313,7 +313,7 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
@@ -323,12 +323,12 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[0]/VButton[1]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
@@ -338,12 +338,12 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[0]/VButton[2]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
@@ -353,7 +353,7 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <!--
@@ -365,7 +365,7 @@
 -->
 <tr>
 	<td>click</td>
-	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::/VVerticalLayout[0]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[0]/VButton[3]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
@@ -375,7 +375,7 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_11352::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
diff --git a/tests/integration-testscripts/Liferay-6EE/Liferay6EE-theme.html b/tests/integration-testscripts/Liferay-6EE/Liferay6EE-theme.html
index ddd01d4e3f..f4772ef7ad 100644
--- a/tests/integration-testscripts/Liferay-6EE/Liferay6EE-theme.html
+++ b/tests/integration-testscripts/Liferay-6EE/Liferay6EE-theme.html
@@ -314,7 +314,7 @@
 </tr>
 <tr>
 	<td>click</td>
-	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[0]/VButton[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
@@ -324,12 +324,12 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[0]/VButton[1]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
@@ -339,12 +339,12 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
 	<td>click</td>
-	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[0]/VButton[2]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
@@ -354,7 +354,7 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <!--
@@ -366,7 +366,7 @@
 -->
 <tr>
 	<td>click</td>
-	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/ChildComponentContainer[1]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[9]/AbsolutePanel[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::/VVerticalLayout[0]/VCssLayout[0]/VCssLayout$FlowPane[0]/VTabsheet[0]/VTabsheetPanel[0]/VGridLayout[0]/VButton[3]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
@@ -376,7 +376,7 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=v-VaadinLiferayThemePortlet_WAR_demo_LAYOUT_10413::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>