diff options
| author | Artur Signell <artur@vaadin.com> | 2012-08-27 13:38:13 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-08-27 13:38:13 +0300 |
| commit | 5964acd1e7ea2a00681fc49525f4f10e5dfa06fe (patch) | |
| tree | dc0c01c12664e567c75d9165eb80457a8a7e5c85 /tests | |
| parent | 2af52b6102051fd9289778c35a1a74c58d51bf02 (diff) | |
| parent | 9a32e217f2cb89887b2a46934b992ff32e880ba1 (diff) | |
| download | vaadin-framework-5964acd1e7ea2a00681fc49525f4f10e5dfa06fe.tar.gz vaadin-framework-5964acd1e7ea2a00681fc49525f4f10e5dfa06fe.zip | |
Merge remote-tracking branch 'origin/6.8'
Conflicts:
server/src/com/vaadin/ui/Select.java
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/testbench/com/vaadin/tests/components/table/CtrlShiftMultiselect.java | 2 | ||||
| -rw-r--r-- | tests/testbench/com/vaadin/tests/components/table/SelectionRangeDragging.html | 52 |
2 files changed, 54 insertions, 0 deletions
diff --git a/tests/testbench/com/vaadin/tests/components/table/CtrlShiftMultiselect.java b/tests/testbench/com/vaadin/tests/components/table/CtrlShiftMultiselect.java index 02f4af045b..b9e23930e4 100644 --- a/tests/testbench/com/vaadin/tests/components/table/CtrlShiftMultiselect.java +++ b/tests/testbench/com/vaadin/tests/components/table/CtrlShiftMultiselect.java @@ -5,6 +5,7 @@ import com.vaadin.data.Item; import com.vaadin.data.util.IndexedContainer; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Table; +import com.vaadin.ui.Table.TableDragMode; @SuppressWarnings("serial") public class CtrlShiftMultiselect extends TestBase { @@ -18,6 +19,7 @@ public class CtrlShiftMultiselect extends TestBase { table.setSelectable(true); table.setMultiSelect(true); + table.setDragMode(TableDragMode.MULTIROW); table.setWidth("400px"); table.setHeight("400px"); diff --git a/tests/testbench/com/vaadin/tests/components/table/SelectionRangeDragging.html b/tests/testbench/com/vaadin/tests/components/table/SelectionRangeDragging.html new file mode 100644 index 0000000000..1e911699d1 --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/table/SelectionRangeDragging.html @@ -0,0 +1,52 @@ +<?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="" /> +<title>New Test</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">New Test</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/run/com.vaadin.tests.components.table.CtrlShiftMultiselect?restartApplication</td> + <td></td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableCtrlShiftMultiselect::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[5]/domChild[1]/domChild[0]</td> + <td>112,12</td> +</tr> +<tr> + <td>mouseClick</td> + <td>vaadin=runcomvaadintestscomponentstableCtrlShiftMultiselect::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[10]/domChild[1]/domChild[0]</td> + <td>82,16:shift</td> +</tr> +<tr> + <td>drag</td> + <td>vaadin=runcomvaadintestscomponentstableCtrlShiftMultiselect::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[8]/domChild[1]/domChild[0]</td> + <td>87,1</td> +</tr> +<tr> + <td>mouseMoveAt</td> + <td>vaadin=runcomvaadintestscomponentstableCtrlShiftMultiselect::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[0]</td> + <td>700,210</td> +</tr> +<tr> + <td>screenCapture</td> + <td></td> + <td>multiple-rows-dragged</td> +</tr> +<tr> + <td>drop</td> + <td>vaadin=runcomvaadintestscomponentstableCtrlShiftMultiselect::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[0]</td> + <td>700,210</td> +</tr> + +</tbody></table> +</body> +</html> |