Always set header/footer style name to TH (#19209)

Change-Id: I8d0240fb76b9841e7290bf13588975da20c78b62

diff --git a/client/src/com/vaadin/client/widgets/Grid.java b/client/src/com/vaadin/client/widgets/Grid.java
index 806bc6a220e6114fc743dc66dcb40909a8998472..80b20fa184ce22df47ad565fe7cc8e8a8801b391 100644 (file)
--- a/client/src/com/vaadin/client/widgets/Grid.java
+++ b/client/src/com/vaadin/client/widgets/Grid.java
@@ -5592,6 +5592,7 @@ public class Grid<T> extends ResizeComposite implements
 
                 Element td = cell.getElement();
                 td.removeAllChildren();
+                setCustomStyleName(td, metadata.getStyleName());
 
                 Element content;
                 // Wrap text or html content in default header to isolate
@@ -5622,7 +5623,6 @@ public class Grid<T> extends ResizeComposite implements
                 } else {
                     content = td;
                 }
-                setCustomStyleName(content, metadata.getStyleName());
 
                 switch (metadata.getType()) {
                 case TEXT:

diff --git a/uitest/src/com/vaadin/tests/components/grid/GridHeaderStyleNamesTest.java b/uitest/src/com/vaadin/tests/components/grid/GridHeaderStyleNamesTest.java
index f5216b42877d7b22527b4353ab579091ece465c8..6dffe16a40b8bae07ebf26f92654f72e15f2fd9b 100644 (file)
--- a/uitest/src/com/vaadin/tests/components/grid/GridHeaderStyleNamesTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/GridHeaderStyleNamesTest.java
@@ -85,23 +85,23 @@ public class GridHeaderStyleNamesTest extends SingleBrowserTest {
         if (set) {
             assertHasStyleName(
                     "Footer cell should have the assigned 'age-footer' class name",
-                    getAgeFooterCellContent(), "age-footer");
+                    getAgeFooterCell(), "age-footer");
             assertHasStyleName(
                     "Header cell should have the assigned 'age' class name",
-                    getAgeHeaderCellContent(), "age");
+                    getAgeHeaderCell(), "age");
             assertHasStyleName(
                     "The merged header cell should have the assigned 'city-country' class name",
-                    getMergedHeaderCellContent(), "city-country");
+                    getMergedHeaderCell(), "city-country");
         } else {
             assertHasNotStyleName(
                     "Footer cell should not have the removed 'age-footer' class name",
-                    getAgeFooterCellContent(), "age-footer");
+                    getAgeFooterCell(), "age-footer");
             assertHasNotStyleName(
                     "Header cell should not have the removed 'age' class name",
-                    getAgeHeaderCellContent(), "age");
+                    getAgeHeaderCell(), "age");
             assertHasNotStyleName(
                     "Ther merged header cell should not have the removed 'city-country' class name",
-                    getMergedHeaderCellContent(), "city-country");
+                    getMergedHeaderCell(), "city-country");
         }
         assertHasStyleName(
                 "The default v-grid-cell style name should not be removed from the header cell",