Close existing details when the generator is changed (#18664)

Change-Id: Iae5e70f42c27731ce40c00604ccc6097323faa79
vaadin · Sep 1, 2015 · 3c9ec4f · 3c9ec4f
1 parent 53a4b2c
commit 3c9ec4f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 19 deletions.
diff --git a/client/src/com/vaadin/client/widgets/Grid.java b/client/src/com/vaadin/client/widgets/Grid.java
@@ -8191,6 +8191,10 @@ public void setDetailsGenerator(DetailsGenerator detailsGenerator)
                     "Details generator may not be null");
         }
 
+        for (Integer index : visibleDetails) {
+            setDetailsVisible(index, false);
+        }
+
         this.detailsGenerator = detailsGenerator;
 
         // this will refresh all visible spacers

diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridDetailsClientTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridDetailsClientTest.java
@@ -17,7 +17,6 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -79,16 +78,6 @@ public void applyRendererThenOpenDetails() {
                 details.getText().startsWith("Row: 1."));
     }
 
-    @Test
-    public void openDetailsThenAppyRenderer() {
-        toggleDetailsFor(1);
-        selectMenuPath(SET_GENERATOR);
-
-        TestBenchElement details = getGridElement().getDetails(1);
-        assertTrue("Unexpected details content",
-                details.getText().startsWith("Row: 1."));
-    }
-
     @Test
     public void openHiddenDetailsThenScrollToIt() {
         try {
@@ -114,8 +103,8 @@ public void errorUpdaterShowsErrorNotification() {
         assertFalse("No notifications should've been at the start",
                 $(FixedNotificationElement.class).exists());
 
-        toggleDetailsFor(1);
         selectMenuPath(SET_FAULTY_GENERATOR);
+        toggleDetailsFor(1);
 
         ElementQuery<FixedNotificationElement> notification = $(FixedNotificationElement.class);
         assertTrue("Was expecting an error notification here",
@@ -126,17 +115,15 @@ public void errorUpdaterShowsErrorNotification() {
                 getGridElement().getDetails(1).getText());
     }
 
-    @Test
-    public void updaterStillWorksAfterError() {
+    @Test(expected = NoSuchElementException.class)
+    public void detailsClosedWhenResettingGenerator() {
+
+        selectMenuPath(SET_GENERATOR);
         toggleDetailsFor(1);
 
         selectMenuPath(SET_FAULTY_GENERATOR);
-        $(FixedNotificationElement.class).first().close();
-        selectMenuPath(SET_GENERATOR);
 
-        assertNotEquals(
-                "New details should've been generated even after error", "",
-                getGridElement().getDetails(1).getText());
+        getGridElement().getDetails(1);
     }
 
     @Test