aboutsummaryrefslogtreecommitdiffstats
path: root/uitest/src/main/java/com
diff options
context:
space:
mode:
authorAnna Koskinen <Ansku@users.noreply.github.com>2021-08-26 12:49:22 +0300
committerGitHub <noreply@github.com>2021-08-26 12:49:22 +0300
commitb6ece49bf437b68a4a31ca787e16118215f72832 (patch)
treec8661070e9e2da8ac9bc4b6dde0a119ae18612f9 /uitest/src/main/java/com
parent5144101da635a9b653668732d27a445ef4392621 (diff)
downloadvaadin-framework-b6ece49bf437b68a4a31ca787e16118215f72832.tar.gz
vaadin-framework-b6ece49bf437b68a4a31ca787e16118215f72832.zip
Fix compatibility Grid column reorder with partially hidden joined cells (#12385)
Fixes #12377
Diffstat (limited to 'uitest/src/main/java/com')
-rw-r--r--uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridReorderMerged.java45
1 files changed, 45 insertions, 0 deletions
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridReorderMerged.java b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridReorderMerged.java
new file mode 100644
index 0000000000..6a3e01427e
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/grid/GridReorderMerged.java
@@ -0,0 +1,45 @@
+package com.vaadin.v7.tests.components.grid;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.v7.ui.Grid;
+import com.vaadin.v7.ui.Grid.Column;
+import com.vaadin.v7.ui.Grid.HeaderRow;
+
+@SuppressWarnings("deprecation")
+public class GridReorderMerged extends AbstractTestUI {
+
+ @SuppressWarnings("unchecked")
+ @Override
+ protected void setup(VaadinRequest request) {
+ Grid grid = new Grid();
+ HeaderRow headerRow = grid.prependHeaderRow();
+ for (int i = 1; i < 10; ++i) {
+ String propertyId = "" + i;
+ Column column = grid.addColumn(propertyId);
+ column.setHidable(true);
+ if (i == 5) {
+ column.setHidden(true);
+ }
+ // add one value per row for easier visualization
+ grid.getContainerDataSource().addItem(i).getItemProperty(propertyId)
+ .setValue(propertyId);
+ }
+ headerRow.join("1", "2", "3").setText("1");
+ headerRow.join("4", "5", "6").setText("2"); // middle column hidden
+ headerRow.join("7", "8", "9").setText("3");
+ grid.setColumnReorderingAllowed(true);
+ addComponent(grid);
+ }
+
+ @Override
+ protected Integer getTicketNumber() {
+ return 12377;
+ }
+
+ @Override
+ protected String getTestDescription() {
+ return "Reordering columns should respect joined cells "
+ + "even when some columns are hidden.";
+ }
+}