diff options
| author | Anna Koskinen <anna@vaadin.com> | 2013-02-04 13:22:59 +0200 |
|---|---|---|
| committer | Anna Koskinen <anna@vaadin.com> | 2013-02-05 16:46:44 +0200 |
| commit | 1a0a3bd5cf248d3b368e52608d38767f2a501115 (patch) | |
| tree | c19fb1040a4f919839966522c41de0d0c06716e6 /uitest/src/com/vaadin/tests | |
| parent | 1431139cb24af12edc6685a2841460a0d4dd03b9 (diff) | |
| download | vaadin-framework-1a0a3bd5cf248d3b368e52608d38767f2a501115.tar.gz vaadin-framework-1a0a3bd5cf248d3b368e52608d38767f2a501115.zip | |
Merge of (#10890) to Vaadin 7.
Fix the positioning of the drop marker when reordering Table columns by
DnD.
Change-Id: I853e9690d931a9bf94c61ac6e59accd1cedac15a
Diffstat (limited to 'uitest/src/com/vaadin/tests')
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.html | 42 | ||||
| -rw-r--r-- | uitest/src/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.java | 48 |
2 files changed, 90 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.html b/uitest/src/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.html new file mode 100644 index 0000000000..5b5c83e629 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.html @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="http://localhost:8068/" /> +<title>ColumnReorderingWithManyColumns</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">ColumnReorderingWithManyColumns</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/run/ColumnReorderingWithManyColumns?restartApplication</td> + <td></td> +</tr> +<tr> + <td>drag</td> + <td>vaadin=runColumnReorderingWithManyColumns::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VScrollTable[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/</td> + <td>10,10</td> +</tr> +<tr> + <td>mouseMoveAt</td> + <td>vaadin=runColumnReorderingWithManyColumns::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VScrollTable[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[10]/domChild[2]</td> + <td>10,10</td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td></td> +</tr> +<tr> + <td>drop</td> + <td>vaadin=runColumnReorderingWithManyColumns::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VScrollTable[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[10]/domChild[2]</td> + <td>10,10</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/uitest/src/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.java b/uitest/src/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.java new file mode 100644 index 0000000000..aeebd299ff --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/table/ColumnReorderingWithManyColumns.java @@ -0,0 +1,48 @@ +/* + * Copyright 2012 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.table; + +import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.Table; + +public class ColumnReorderingWithManyColumns extends TestBase { + + private static final int NUM_COLS = 16; + + @Override + protected void setup() { + Table table = new Table(); + table.setSizeFull(); + table.setColumnReorderingAllowed(true); + + for (int i = 0; i < NUM_COLS; ++i) { + table.addContainerProperty("col-" + i, String.class, null); + } + + addComponent(table); + } + + @Override + protected String getDescription() { + return "When reordering columns via drag'n'drop, the drop marker is drawn too far to the right."; + } + + @Override + protected Integer getTicketNumber() { + return 10890; + } +} |