Support caption fetching for HTML and Widget headers. (#18528)

Change-Id: Idad2cbbb6b138258ff6428e7ecc3d922ef99c675

1 files changed, 20 insertions, 0 deletions

diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/GridColumns.java b/server/tests/src/com/vaadin/tests/server/component/grid/GridColumns.java
index da230e86c7..83e9f21756 100644
--- a/server/tests/src/com/vaadin/tests/server/component/grid/GridColumns.java
+++ b/server/tests/src/com/vaadin/tests/server/component/grid/GridColumns.java
@@ -18,6 +18,8 @@ package com.vaadin.tests.server.component.grid;
 import static org.easymock.EasyMock.and;
 import static org.easymock.EasyMock.capture;
 import static org.easymock.EasyMock.isA;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -391,4 +393,22 @@ public class GridColumns {
         assertFalse("Event should not be userOriginated",
                 event.isUserOriginated());
     }
+
+	@Test
+    public void textHeaderCaptionIsReturned() {
+        Column firstColumn = grid.getColumns().get(0);
+
+        firstColumn.setHeaderCaption("text");
+
+        assertThat(firstColumn.getHeaderCaption(), is("text"));
+    }
+
+    @Test
+    public void defaultCaptionIsReturnedForHtml() {
+        Column firstColumn = grid.getColumns().get(0);
+
+        grid.getDefaultHeaderRow().getCell("column0").setHtml("<b>html</b>");
+
+        assertThat(firstColumn.getHeaderCaption(), is("Column0"));
+    }
 }