aboutsummaryrefslogtreecommitdiffstats
path: root/uitest/src
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2015-09-02 20:45:30 +0300
committerJohannes Dahlström <johannesd@vaadin.com>2015-11-04 13:38:22 +0200
commit33936feb9fddc422948296c6eb1df8085cf6657b (patch)
treed1fc83634fbaf5fc0e28bc7f3dab4c9d79e4fec5 /uitest/src
parente17fd8d27ddbdbd467d02c8b060c47b753931f7f (diff)
downloadvaadin-framework-33936feb9fddc422948296c6eb1df8085cf6657b.tar.gz
vaadin-framework-33936feb9fddc422948296c6eb1df8085cf6657b.zip
Render null header caption as empty (#18553)
Change-Id: Iaeba81c7e40d4be5f16e74fa8bcf8c86c53a7d3d
Diffstat (limited to 'uitest/src')
-rw-r--r--uitest/src/com/vaadin/tests/components/grid/NullHeaders.java40
-rw-r--r--uitest/src/com/vaadin/tests/components/grid/NullHeadersTest.java48
2 files changed, 88 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/grid/NullHeaders.java b/uitest/src/com/vaadin/tests/components/grid/NullHeaders.java
new file mode 100644
index 0000000000..10fe20c478
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/grid/NullHeaders.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.components.grid;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUIWithLog;
+import com.vaadin.ui.Grid;
+
+public class NullHeaders extends AbstractTestUIWithLog {
+
+ @Override
+ protected void setup(VaadinRequest request) {
+ final Grid grid = new Grid();
+ grid.addColumn("country", String.class);
+ grid.addColumn("foo", String.class);
+ grid.addColumn("bar", Integer.class);
+
+ grid.getColumn("country").setHeaderCaption(null);
+ grid.getColumn("foo").setHeaderCaption("");
+ grid.getColumn("bar").setHeaderCaption(null);
+ grid.addRow("Finland", "foo", 1);
+ grid.addRow("Swaziland", "bar", 2);
+ grid.addRow("Japan", "baz", 3);
+ addComponent(grid);
+ }
+
+}
diff --git a/uitest/src/com/vaadin/tests/components/grid/NullHeadersTest.java b/uitest/src/com/vaadin/tests/components/grid/NullHeadersTest.java
new file mode 100644
index 0000000000..55f1238326
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/grid/NullHeadersTest.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.components.grid;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.vaadin.testbench.elements.GridElement;
+import com.vaadin.tests.tb3.SingleBrowserTest;
+
+public class NullHeadersTest extends SingleBrowserTest {
+
+ @Test
+ public void gridWithNullHeadersShouldBeRendered() {
+ openTestURL();
+
+ GridElement grid = $(GridElement.class).first();
+
+ Assert.assertEquals(1, grid.getHeaderCount());
+ Assert.assertEquals(3, grid.getHeaderCells(0).size());
+ for (int i = 0; i < 3; i++) {
+ Assert.assertEquals("", grid.getHeaderCell(0, 0).getText());
+ }
+ assertRow(grid, 0, "Finland", "foo", "1");
+ assertRow(grid, 1, "Swaziland", "bar", "2");
+ assertRow(grid, 2, "Japan", "baz", "3");
+ }
+
+ private void assertRow(GridElement grid, int row, String... contents) {
+ for (int col = 0; col < contents.length; col++) {
+ Assert.assertEquals(contents[col], grid.getCell(row, col).getText());
+ }
+
+ }
+}