summaryrefslogtreecommitdiffstats
path: root/uitest
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2013-06-05 19:15:49 +0300
committerArtur Signell <artur@vaadin.com>2013-06-05 19:15:54 +0300
commit1f144228f657b5014bc8fd3b08cf8f33950966f6 (patch)
tree13ab5e89e98194030a0912c91e5dfce951696cee /uitest
parentfad7bf7a791db16349467ccbc508d0e472330fa0 (diff)
parent14ebd0d9c8bdfa9940786492876172d1891f593f (diff)
downloadvaadin-framework-1f144228f657b5014bc8fd3b08cf8f33950966f6.tar.gz
vaadin-framework-1f144228f657b5014bc8fd3b08cf8f33950966f6.zip
Merge changes from origin/7.0
892b8ba Do not submit TextArea value on enter in IE (#11982) bd3f975 Properly disable combobox when parent is disabled (#10734) 1b85e59 Added missing import (#11982) 3c8a3bf Merge of properly focus clicked input element in Webkit (#11854, #11297) d647d7a Ensure VBrowserFrame content is unloaded in IE (#11683) 08ba394 Disable drag&drop when source or target component is disabled, re-implementation of 6.8 fix for #11801 b01427a Change field types from LinkedHashSet back to HashSet to retain binary compatibility (#11432) 14ebd0d Fixed newlines Change-Id: Icea535d8d5130e013327dd76a194e3910f533332
Diffstat (limited to 'uitest')
-rw-r--r--uitest/src/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java32
-rw-r--r--uitest/src/com/vaadin/tests/components/combobox/ComboBoxParentDisable.html125
-rw-r--r--uitest/src/com/vaadin/tests/components/combobox/ComboBoxParentDisable.java81
-rw-r--r--uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropDisable.html77
-rw-r--r--uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropDisable.java142
5 files changed, 457 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java b/uitest/src/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java
new file mode 100644
index 0000000000..161f9cd520
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/abstractfield/FieldFocusOnClick.java
@@ -0,0 +1,32 @@
+package com.vaadin.tests.components.abstractfield;
+
+import java.util.Arrays;
+
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.NativeButton;
+import com.vaadin.ui.OptionGroup;
+import com.vaadin.ui.TextField;
+
+public class FieldFocusOnClick extends AbstractTestUI {
+
+ @Override
+ protected void setup(VaadinRequest request) {
+ addComponent(new TextField(null, "TextField"));
+ addComponent(new CheckBox("CheckBox"));
+ addComponent(new OptionGroup(null,
+ Arrays.asList("Option 1", "Option 2")));
+ addComponent(new NativeButton("NativeButton"));
+ }
+
+ @Override
+ protected String getTestDescription() {
+ return "Webkit doesn't focus non-text input elements when clicked";
+ }
+
+ @Override
+ protected Integer getTicketNumber() {
+ return 11854;
+ }
+} \ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxParentDisable.html b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxParentDisable.html
new file mode 100644
index 0000000000..ab8c4f81d0
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxParentDisable.html
@@ -0,0 +1,125 @@
+<?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:8888/" />
+<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.combobox.ComboBoxParentDisable?restartApplication</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxParentDisable::/VVerticalLayout[0]/Slot[1]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]#button</td>
+ <td>6,16</td>
+</tr>
+<tr>
+ <td>assertText</td>
+ <td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']/div/div[2]/table/tbody/tr[2]/td/span</td>
+ <td>Item 1</td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxParentDisable::/VVerticalLayout[0]/domChild[1]</td>
+ <td>371,22</td>
+</tr>
+<tr>
+ <td>assertElementNotPresent</td>
+ <td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']</td>
+ <td>Item 1</td>
+</tr>
+<!--Disable combobox-->
+<tr>
+ <td>click</td>
+ <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxParentDisable::/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxParentDisable::/VVerticalLayout[0]/Slot[1]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]#button</td>
+ <td>8,12</td>
+</tr>
+<tr>
+ <td>assertElementNotPresent</td>
+ <td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']</td>
+ <td>Item 1</td>
+</tr>
+<!--Enable combobox-->
+<tr>
+ <td>click</td>
+ <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxParentDisable::/VVerticalLayout[0]/Slot[2]/VButton[0]/domChild[0]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>pause</td>
+ <td></td>
+ <td>100</td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxParentDisable::/VVerticalLayout[0]/Slot[1]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]#button</td>
+ <td>8,12</td>
+</tr>
+<tr>
+ <td>assertElementPresent</td>
+ <td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']</td>
+ <td>Item 1</td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxParentDisable::/VVerticalLayout[0]/domChild[1]</td>
+ <td>371,22</td>
+</tr>
+<!--Disable parent-->
+<tr>
+ <td>click</td>
+ <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxParentDisable::/VVerticalLayout[0]/Slot[3]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxParentDisable::/VVerticalLayout[0]/Slot[1]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]#button</td>
+ <td>8,12</td>
+</tr>
+<tr>
+ <td>assertElementNotPresent</td>
+ <td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']</td>
+ <td>Item 1</td>
+</tr>
+<!--Enable parent-->
+<tr>
+ <td>click</td>
+ <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxParentDisable::/VVerticalLayout[0]/Slot[3]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>pause</td>
+ <td></td>
+ <td>100</td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxParentDisable::/VVerticalLayout[0]/Slot[1]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VFilterSelect[0]#button</td>
+ <td>8,12</td>
+</tr>
+<tr>
+ <td>assertElementPresent</td>
+ <td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']</td>
+ <td>Item 1</td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxParentDisable::/VVerticalLayout[0]/domChild[1]</td>
+ <td>371,22</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxParentDisable.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxParentDisable.java
new file mode 100644
index 0000000000..84355c4d89
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxParentDisable.java
@@ -0,0 +1,81 @@
+package com.vaadin.tests.components.combobox;
+
+import com.vaadin.data.Property;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUIWithLog;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.ComboBox;
+import com.vaadin.ui.FormLayout;
+import com.vaadin.ui.VerticalLayout;
+
+/**
+ * The Application's "main" class
+ */
+@SuppressWarnings("serial")
+public class ComboBoxParentDisable extends AbstractTestUIWithLog {
+
+ @Override
+ protected void setup(VaadinRequest request) {
+ final VerticalLayout layout = new VerticalLayout();
+ layout.setMargin(true);
+ setContent(layout);
+
+ final FormLayout formLayout = new FormLayout();
+
+ final ComboBox combo = new ComboBox("Item:");
+ combo.addItem("Item 1");
+ combo.addItem("Item 2");
+ combo.addItem("Item 3");
+ combo.addItem("Item 4");
+ combo.addValueChangeListener(new MyValueChangeListener());
+ combo.setImmediate(true);
+
+ Button btn1 = new Button("Click me");
+ btn1.addClickListener(new Button.ClickListener() {
+ @Override
+ public void buttonClick(ClickEvent event) {
+ log.log("you clicked me");
+ }
+ });
+
+ formLayout.addComponent(combo);
+ formLayout.addComponent(btn1);
+
+ layout.addComponent(formLayout);
+
+ Button btn = new Button("Enable/Disable combobox",
+ new Button.ClickListener() {
+ @Override
+ public void buttonClick(ClickEvent event) {
+ combo.setEnabled(!combo.isEnabled());
+ }
+ });
+ layout.addComponent(btn);
+ btn = new Button("Enable/Disable parent", new Button.ClickListener() {
+ @Override
+ public void buttonClick(ClickEvent event) {
+ formLayout.setEnabled(!formLayout.isEnabled());
+ }
+ });
+ layout.addComponent(btn);
+
+ }
+
+ private class MyValueChangeListener implements Property.ValueChangeListener {
+ @Override
+ public void valueChange(Property.ValueChangeEvent event) {
+ log.log("you made a selection change");
+ }
+ }
+
+ @Override
+ protected String getTestDescription() {
+ return "Test for ensuring that disabling a parent properly disables the combobox";
+ }
+
+ @Override
+ protected Integer getTicketNumber() {
+ return 10734;
+ }
+} \ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropDisable.html b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropDisable.html
new file mode 100644
index 0000000000..1565e5eb96
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropDisable.html
@@ -0,0 +1,77 @@
+<?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:8888/" />
+<title>DragAndDropDisable</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">DragAndDropDisable</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/run/DragAndDropDisable?restartApplication</td>
+ <td></td>
+</tr>
+<tr>
+ <td>drag</td>
+ <td>vaadin=runDragAndDropDisable::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VPanel[0]/VDragAndDropWrapper[0]/VCssLayout[0]</td>
+ <td>18,25</td>
+</tr>
+<tr>
+ <td>drop</td>
+ <td>vaadin=runDragAndDropDisable::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VPanel[0]/VDragAndDropWrapper[0]/VCssLayout[0]</td>
+ <td>34,51</td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>vaadin=runDragAndDropDisable::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[1]/VCheckBox[0]/domChild[0]</td>
+ <td>7,4</td>
+</tr>
+<tr>
+ <td>drag</td>
+ <td>vaadin=runDragAndDropDisable::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VPanel[0]/VDragAndDropWrapper[0]/VCssLayout[0]</td>
+ <td>20,32</td>
+</tr>
+<tr>
+ <td>drop</td>
+ <td>vaadin=runDragAndDropDisable::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VPanel[0]/VDragAndDropWrapper[0]/VCssLayout[0]</td>
+ <td>37,59</td>
+</tr>
+<tr>
+ <td>drag</td>
+ <td>vaadin=runDragAndDropDisable::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VPanel[0]/VDragAndDropWrapper[0]/VCssLayout[0]/VLabel[0]</td>
+ <td>59,10</td>
+</tr>
+<tr>
+ <td>drop</td>
+ <td>vaadin=runDragAndDropDisable::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[2]/VPanel[0]/VDragAndDropWrapper[0]/VCssLayout[0]</td>
+ <td>68,15</td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>vaadin=runDragAndDropDisable::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VPanel[0]/VDragAndDropWrapper[0]/VCssLayout[0]/VLabel[0]</td>
+ <td>68,160</td>
+</tr>
+<tr>
+ <td>drag</td>
+ <td>vaadin=runDragAndDropDisable::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[4]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+ <td>82,9</td>
+</tr>
+<tr>
+ <td>drop</td>
+ <td>vaadin=runDragAndDropDisable::/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VPanel[0]/VDragAndDropWrapper[0]/VCssLayout[0]</td>
+ <td>118,50</td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropDisable.java b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropDisable.java
new file mode 100644
index 0000000000..fb7ed92967
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropDisable.java
@@ -0,0 +1,142 @@
+package com.vaadin.tests.components.draganddropwrapper;
+
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
+import com.vaadin.event.dd.DragAndDropEvent;
+import com.vaadin.event.dd.DropHandler;
+import com.vaadin.event.dd.acceptcriteria.AcceptAll;
+import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.ui.CheckBox;
+import com.vaadin.ui.CssLayout;
+import com.vaadin.ui.DragAndDropWrapper;
+import com.vaadin.ui.DragAndDropWrapper.DragStartMode;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Panel;
+import com.vaadin.ui.Table;
+import com.vaadin.ui.Table.TableDragMode;
+
+public class DragAndDropDisable extends AbstractTestUI {
+
+ @Override
+ protected Integer getTicketNumber() {
+ return 11801;
+ }
+
+ @Override
+ protected void setup(VaadinRequest request) {
+ {
+ final Panel p = new Panel("Drag here");
+ addComponent(p);
+
+ final CssLayout layout = new CssLayout();
+ layout.setHeight("100px");
+
+ final DragAndDropWrapper dnd = new DragAndDropWrapper(layout);
+ p.setContent(dnd);
+
+ final CheckBox enabled = new CheckBox("Enabled", true);
+ addComponent(enabled);
+ enabled.setImmediate(true);
+ enabled.addListener(new ValueChangeListener() {
+
+ @Override
+ public void valueChange(ValueChangeEvent event) {
+ dnd.setEnabled(enabled.booleanValue());
+ }
+ });
+
+ dnd.setDropHandler(new DropHandler() {
+
+ @Override
+ public AcceptCriterion getAcceptCriterion() {
+ return AcceptAll.get();
+ }
+
+ @Override
+ public void drop(DragAndDropEvent event) {
+ layout.addComponent(new Label("You dropped something!"));
+ }
+ });
+
+ dnd.setDragStartMode(DragStartMode.COMPONENT);
+ }
+
+ {
+ final Panel p = new Panel("Drag here");
+ addComponent(p);
+
+ final CssLayout layout = new CssLayout();
+ layout.setHeight("100px");
+
+ final DragAndDropWrapper dnd = new DragAndDropWrapper(layout);
+ p.setContent(dnd);
+
+ final CheckBox enabled = new CheckBox("Enabled", true);
+ addComponent(enabled);
+ enabled.setImmediate(true);
+ enabled.addListener(new ValueChangeListener() {
+
+ @Override
+ public void valueChange(ValueChangeEvent event) {
+ dnd.setEnabled(enabled.booleanValue());
+ }
+ });
+
+ dnd.setDropHandler(new DropHandler() {
+
+ @Override
+ public AcceptCriterion getAcceptCriterion() {
+ return AcceptAll.get();
+ }
+
+ @Override
+ public void drop(DragAndDropEvent event) {
+ layout.addComponent(new Label("You dropped something!"));
+ }
+ });
+
+ dnd.setDragStartMode(DragStartMode.COMPONENT);
+ }
+
+ {
+ final Table tbl = new Table();
+ tbl.addContainerProperty("column", String.class,
+ "drag/drop to/from here");
+ for (int i = 0; i < 5; i++) {
+ tbl.addItem();
+ }
+ addComponent(tbl);
+ tbl.setDragMode(TableDragMode.ROW);
+ tbl.setDropHandler(new DropHandler() {
+
+ @Override
+ public AcceptCriterion getAcceptCriterion() {
+ return AcceptAll.get();
+ }
+
+ @Override
+ public void drop(DragAndDropEvent event) {
+ tbl.getItem(tbl.addItem()).getItemProperty("column")
+ .setValue("You dropped something");
+ }
+ });
+ final CheckBox enabled = new CheckBox("Enabled", true);
+ addComponent(enabled);
+ enabled.setImmediate(true);
+ enabled.addListener(new ValueChangeListener() {
+
+ @Override
+ public void valueChange(ValueChangeEvent event) {
+ tbl.setEnabled(enabled.booleanValue());
+ }
+ });
+ }
+ }
+
+ @Override
+ protected String getTestDescription() {
+ return "DragAndDropWrapper must be disableable";
+ }
+}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 01:56:55 +0000