1 files changed, 26 insertions, 0 deletions
diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridDefaultHeaderTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridDefaultHeaderTest.java
index bdecc15c35..e863143bb4 100644
--- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridDefaultHeaderTest.java
+++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridDefaultHeaderTest.java
@@ -25,6 +25,7 @@ import org.junit.Test;
 import com.vaadin.data.ValueProvider;
 import com.vaadin.ui.Grid;
 import com.vaadin.ui.Grid.Column;
+import com.vaadin.ui.components.grid.HeaderCell;
 import com.vaadin.ui.components.grid.HeaderRow;
 
 public class GridDefaultHeaderTest {
@@ -84,4 +85,29 @@ public class GridDefaultHeaderTest {
 
         assertEquals("First", grid.getHeaderRow(0).getCell(column1).getText());
     }
+
+    @Test
+    public void updateDefaultRow_columnCaptionUpdated() {
+        grid.getDefaultHeaderRow().getCell(column1).setText("new");
+        assertEquals("new", column1.getCaption());
+        assertEquals("Second", column2.getCaption());
+    }
+
+    @Test
+    public void updateDefaultRowWithMergedCell_columnCaptionNotUpdated() {
+        HeaderCell merged = grid.getDefaultHeaderRow().join(column1, column2);
+        merged.setText("new");
+        assertEquals("First", column1.getCaption());
+        assertEquals("Second", column2.getCaption());
+    }
+
+    @Test
+    public void updateColumnCaption_defaultRowWithMergedCellNotUpdated() {
+        HeaderCell merged = grid.getDefaultHeaderRow().join(column1, column2);
+        merged.setText("new");
+        column1.setCaption("foo");
+        column2.setCaption("bar");
+
+        assertEquals("new", merged.getText());
+    }
 }