summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java5
-rw-r--r--uitest/src/com/vaadin/tests/tb3/newelements/FixedNotificationElement.java16
2 files changed, 19 insertions, 2 deletions
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java
index 61dbfbc7c9..994b2e8e2e 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridEditorTest.java
@@ -38,6 +38,7 @@ import com.vaadin.testbench.elements.GridElement.GridEditorElement;
import com.vaadin.testbench.elements.NotificationElement;
import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeatures;
import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeaturesTest;
+import com.vaadin.tests.tb3.newelements.FixedNotificationElement;
public class GridEditorTest extends GridBasicFeaturesTest {
@@ -215,9 +216,9 @@ public class GridEditorTest extends GridBasicFeaturesTest {
intField.clear();
intField.sendKeys("banana phone");
editor.save();
- WebElement n = $(NotificationElement.class).first();
+ FixedNotificationElement n = $(FixedNotificationElement.class).first();
assertEquals("Column 7: Could not convert value to Integer",
- n.getText());
+ n.getCaption());
n.click();
editor.cancel();
diff --git a/uitest/src/com/vaadin/tests/tb3/newelements/FixedNotificationElement.java b/uitest/src/com/vaadin/tests/tb3/newelements/FixedNotificationElement.java
new file mode 100644
index 0000000000..db20016486
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/tb3/newelements/FixedNotificationElement.java
@@ -0,0 +1,16 @@
+package com.vaadin.tests.tb3.newelements;
+
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.testbench.By;
+import com.vaadin.testbench.elements.NotificationElement;
+import com.vaadin.testbench.elements.ServerClass;
+
+@ServerClass("com.vaadin.ui.Notification")
+public class FixedNotificationElement extends NotificationElement {
+ public String getCaption() {
+ WebElement popup = findElement(By.className("popupContent"));
+ WebElement caption = popup.findElement(By.tagName("h1"));
+ return caption.getText();
+ }
+}