Fixes edge case in null details generation for Grid (#17274)

Change-Id: I1bf4c2f0600baea8b925bd31dcd42c1e901a7c8b

1 files changed, 24 insertions, 2 deletions

diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridDetailsServerTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridDetailsServerTest.java
index 7ddd903161..cfaf79ea05 100644
--- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridDetailsServerTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/server/GridDetailsServerTest.java
@@ -81,6 +81,22 @@ public class GridDetailsServerTest extends GridBasicFeaturesTest {
     }
 
     @Test
+    public void openVisiblePopulatedDetails() {
+        selectMenuPath(DETAILS_GENERATOR_WATCHING);
+        selectMenuPath(OPEN_FIRST_ITEM_DETAILS);
+        assertNotNull("details should've populated", getGridElement()
+                .getDetails(0).findElement(By.className("v-widget")));
+    }
+
+    @Test(expected = NoSuchElementException.class)
+    public void closeVisiblePopulatedDetails() {
+        selectMenuPath(DETAILS_GENERATOR_WATCHING);
+        selectMenuPath(OPEN_FIRST_ITEM_DETAILS);
+        selectMenuPath(OPEN_FIRST_ITEM_DETAILS);
+        getGridElement().getDetails(0);
+    }
+
+    @Test
     public void openDetailsOutsideOfActiveRange() throws InterruptedException {
         getGridElement().scroll(10000);
         selectMenuPath(OPEN_FIRST_ITEM_DETAILS);
@@ -260,8 +276,14 @@ public class GridDetailsServerTest extends GridBasicFeaturesTest {
         selectMenuPath(OPEN_FIRST_ITEM_DETAILS);
         selectMenuPath(DETAILS_GENERATOR_WATCHING);
         selectMenuPath(DETAILS_GENERATOR_NULL);
-        assertTrue("Details should be empty with null component",
-                getGridElement().getDetails(0).getText().isEmpty());
+
+        try {
+            assertTrue("Details should be empty with null component",
+                    getGridElement().getDetails(0).getText().isEmpty());
+        } catch (NoSuchElementException e) {
+            fail("Expected to find a details row with empty content");
+        }
+
         selectMenuPath(DETAILS_GENERATOR_WATCHING);
         assertFalse("Details should be not empty with details component",
                 getGridElement().getDetails(0).getText().isEmpty());