Better handle exceptions when opening Grid editor (#17935)

Change-Id: I68103db75c422b042988c6662da268ff9d11a306

1 files changed, 6 insertions, 2 deletions

diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/GridEditorTest.java b/server/tests/src/com/vaadin/tests/server/component/grid/GridEditorTest.java
index 135d7d398c..b70f17779a 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/GridEditorTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/grid/GridEditorTest.java
@@ -184,12 +184,16 @@ public class GridEditorTest {
                 .getEditorField();
         field.setValue("New Name");
 
+        Property<?> datasource = field.getPropertyDataSource();
+
         grid.cancelEditor();
         assertFalse(grid.isEditorActive());
         assertNull(grid.getEditedItemId());
         assertFalse(field.isModified());
-        assertEquals(DEFAULT_NAME, field.getValue());
-        assertEquals(DEFAULT_NAME, field.getPropertyDataSource().getValue());
+        assertEquals("", field.getValue());
+        assertEquals(DEFAULT_NAME, datasource.getValue());
+        assertNull(field.getPropertyDataSource());
+        assertNull(grid.getEditorFieldGroup().getItemDataSource());
     }
 
     @Test(expected = IllegalArgumentException.class)