Use proper selector when closing notifications (#9220)

Change-Id: Ic207d5423e9f3d18c33be9ce04196446ee11a7ea

7 files changed, 27 insertions, 29 deletions

diff --git a/uitest/src/com/vaadin/tests/components/notification/Notifications.html b/uitest/src/com/vaadin/tests/components/notification/Notifications.html
index c9016cfd6f..7554175cdb 100644
--- a/uitest/src/com/vaadin/tests/components/notification/Notifications.html
+++ b/uitest/src/com/vaadin/tests/components/notification/Notifications.html
@@ -43,7 +43,7 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
@@ -63,7 +63,7 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
@@ -88,7 +88,7 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
@@ -108,7 +108,7 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
@@ -133,7 +133,7 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
@@ -153,7 +153,7 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
@@ -178,7 +178,7 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
@@ -198,7 +198,7 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
@@ -228,7 +228,7 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
@@ -248,7 +248,7 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
@@ -273,7 +273,7 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotifications::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
diff --git a/uitest/src/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.html b/uitest/src/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.html
index 455952fb71..1e43728f6a 100644
--- a/uitest/src/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.html
+++ b/uitest/src/com/vaadin/tests/components/notification/NotificationsHtmlAllowed.html
@@ -28,7 +28,7 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=runcomvaadintestscomponentsnotificationNotificationsHtmlAllowed::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
diff --git a/uitest/src/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.html b/uitest/src/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.html
index ede2ea70fc..bab6c8dc16 100644
--- a/uitest/src/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.html
+++ b/uitest/src/com/vaadin/tests/components/table/TableShouldNotEatValueChanges.html
@@ -38,7 +38,7 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=runcomvaadintestscomponentstableTableShouldNotEatValueChanges::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
@@ -68,10 +68,9 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=runcomvaadintestscomponentstableTableShouldNotEatValueChanges::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/uitest/src/com/vaadin/tests/components/treetable/ProgrammaticCollapse.html b/uitest/src/com/vaadin/tests/components/treetable/ProgrammaticCollapse.html
index 44dd858378..e06efe85d7 100644
--- a/uitest/src/com/vaadin/tests/components/treetable/ProgrammaticCollapse.html
+++ b/uitest/src/com/vaadin/tests/components/treetable/ProgrammaticCollapse.html
@@ -28,7 +28,7 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=runcomvaadintestscomponentstreetableProgrammaticCollapse::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
@@ -43,7 +43,7 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=runcomvaadintestscomponentstreetableProgrammaticCollapse::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
@@ -53,7 +53,7 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=runcomvaadintestscomponentstreetableProgrammaticCollapse::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
@@ -68,7 +68,7 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=runcomvaadintestscomponentstreetableProgrammaticCollapse::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
@@ -83,7 +83,7 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=runcomvaadintestscomponentstreetableProgrammaticCollapse::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
@@ -98,7 +98,7 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=runcomvaadintestscomponentstreetableProgrammaticCollapse::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <tr>
@@ -106,7 +106,6 @@
 	<td></td>
 	<td>manycollapsed</td>
 </tr>
-
 </tbody></table>
 </body>
 </html>
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/BooleanTextField.html b/uitest/src/com/vaadin/tests/fieldgroup/BooleanTextField.html
index a71cf3ff64..92c03e14f4 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/BooleanTextField.html
+++ b/uitest/src/com/vaadin/tests/fieldgroup/BooleanTextField.html
@@ -122,7 +122,7 @@
 </tr>
 <tr>
 	<td>closeNotification</td>
-	<td>//body/div[2]</td>
+	<td>vaadin=runcomvaadintestsfieldgroupBasicPersonForm::Root/VNotification[0]</td>
 	<td>0,0</td>
 </tr>
 <!--commit last name and new deceased status-->
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/CommitHandlerFailures.html b/uitest/src/com/vaadin/tests/fieldgroup/CommitHandlerFailures.html
index 2ad104c16c..f0fe883d57 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/CommitHandlerFailures.html
+++ b/uitest/src/com/vaadin/tests/fieldgroup/CommitHandlerFailures.html
@@ -105,7 +105,7 @@ public class CommitHandlerFailures_html {
     </tr>
     <tr>
     	<td>closeNotification</td>
-    	<td>//body/div[2]</td>
+    	<td>vaadin=runcomvaadintestsfieldgroupBasicPersonForm::Root/VNotification[0]</td>
     	<td>0,0</td>
     </tr>
     <tr>
@@ -141,7 +141,7 @@ public class CommitHandlerFailures_html {
     </tr>
     <tr>
     	<td>closeNotification</td>
-    	<td>//body/div[2]</td>
+    	<td>vaadin=runcomvaadintestsfieldgroupBasicPersonForm::Root/VNotification[0]</td>
     	<td>0,0</td>
     </tr>
     <tr>
diff --git a/uitest/src/com/vaadin/tests/fieldgroup/CommitWithValidationOrConversionError.html b/uitest/src/com/vaadin/tests/fieldgroup/CommitWithValidationOrConversionError.html
index 2c88930077..e32633513b 100644
--- a/uitest/src/com/vaadin/tests/fieldgroup/CommitWithValidationOrConversionError.html
+++ b/uitest/src/com/vaadin/tests/fieldgroup/CommitWithValidationOrConversionError.html
@@ -29,7 +29,7 @@
     </tr>
     <tr>
     	<td>closeNotification</td>
-    	<td>//body/div[2]</td>
+    	<td>vaadin=runcomvaadintestsfieldgroupBasicPersonForm::Root/VNotification[0]</td>
     	<td>0,0</td>
     </tr>
     <tr>
@@ -60,7 +60,7 @@
     </tr>
     <tr>
     	<td>closeNotification</td>
-    	<td>//body/div[2]</td>
+    	<td>vaadin=runcomvaadintestsfieldgroupBasicPersonForm::Root/VNotification[0]</td>
     	<td>0,0</td>
     </tr>
     <tr>
@@ -81,7 +81,7 @@
     </tr>
     <tr>
     	<td>closeNotification</td>
-    	<td>//body/div[2]</td>
+    	<td>vaadin=runcomvaadintestsfieldgroupBasicPersonForm::Root/VNotification[0]</td>
     	<td>0,0</td>
     </tr>
     <tr>
@@ -102,7 +102,7 @@
     </tr>
     <tr>
     	<td>closeNotification</td>
-    	<td>//body/div[2]</td>
+    	<td>vaadin=runcomvaadintestsfieldgroupBasicPersonForm::Root/VNotification[0]</td>
     	<td>0,0</td>
     </tr>
     <tr>