diff options
| author | Olli Tietäväinen <ollit@vaadin.com> | 2019-07-01 15:17:59 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-01 15:17:59 +0300 |
| commit | a723b85680fe28082c9740c3ae26624b9b772d98 (patch) | |
| tree | f386396a24a652dd21ff7ab0ee653231f148af96 /uitest | |
| parent | d518088ea99b29d205dbf05ca61b8ed736ffcbca (diff) | |
| download | vaadin-framework-a723b85680fe28082c9740c3ae26624b9b772d98.tar.gz vaadin-framework-a723b85680fe28082c9740c3ae26624b9b772d98.zip | |
Table / TreeTable multiselect disabling of touch detection (#11641)
* Fixes #11601. Add toggle for disabling touch detection on table multiselect.
* fix tests
Diffstat (limited to 'uitest')
7 files changed, 207 insertions, 3 deletions
diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/CtrlShiftMultiselect.java b/uitest/src/main/java/com/vaadin/tests/components/table/CtrlShiftMultiselect.java index b9e23930e4..04838b9a88 100644 --- a/uitest/src/main/java/com/vaadin/tests/components/table/CtrlShiftMultiselect.java +++ b/uitest/src/main/java/com/vaadin/tests/components/table/CtrlShiftMultiselect.java @@ -10,10 +10,10 @@ import com.vaadin.ui.Table.TableDragMode; @SuppressWarnings("serial") public class CtrlShiftMultiselect extends TestBase { + protected final Table table = new Table("Multiselectable table"); + @Override protected void setup() { - final Table table = new Table("Multiselectable table"); - table.setContainerDataSource(createContainer()); table.setImmediate(true); diff --git a/uitest/src/main/java/com/vaadin/tests/components/table/CtrlShiftMultiselectTouchDetectionDisabled.java b/uitest/src/main/java/com/vaadin/tests/components/table/CtrlShiftMultiselectTouchDetectionDisabled.java new file mode 100644 index 0000000000..9b410af276 --- /dev/null +++ b/uitest/src/main/java/com/vaadin/tests/components/table/CtrlShiftMultiselectTouchDetectionDisabled.java @@ -0,0 +1,47 @@ +package com.vaadin.tests.components.table; + +import com.vaadin.data.Container; +import com.vaadin.data.Item; +import com.vaadin.data.Property; +import com.vaadin.data.util.IndexedContainer; +import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.Label; +import com.vaadin.ui.Table; +import com.vaadin.ui.Table.TableDragMode; + +import java.util.Set; + +@SuppressWarnings("serial") +public class CtrlShiftMultiselectTouchDetectionDisabled extends CtrlShiftMultiselect { + + protected Label label; + + @Override + protected void setup() { + super.setup(); + label = new Label("0"); + label.setId("count"); + label.setCaption("Amount of selected items"); + table.setMultiSelectTouchDetectionEnabled(false); + table.addValueChangeListener(new Property.ValueChangeListener() { + @Override + public void valueChange(Property.ValueChangeEvent event) { + Property property = event.getProperty(); + Set set = (Set) property.getValue(); + label.setValue("" + set.size()); + } + }); + addComponent(label); + } + + @Override + protected String getDescription() { + return "Allow disabling multi selection's touch screen detection for hybrid devices"; + } + + @Override + protected Integer getTicketNumber() { + return 11601; + } + +} diff --git a/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableMultiselect.java b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableMultiselect.java new file mode 100644 index 0000000000..7b19d29d2e --- /dev/null +++ b/uitest/src/main/java/com/vaadin/tests/components/treetable/TreeTableMultiselect.java @@ -0,0 +1,64 @@ +package com.vaadin.tests.components.treetable; + +import com.vaadin.data.Property; +import com.vaadin.server.VaadinRequest; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.Label; +import com.vaadin.ui.TreeTable; + +import java.util.Set; + +import static com.vaadin.server.Sizeable.Unit.PIXELS; + +public class TreeTableMultiselect extends AbstractTestUI { + + protected final TreeTable tt = new TreeTable("Multiselectable treetable"); + protected Label label; + + @Override + protected void setup(VaadinRequest request) { + label = new Label("0"); + label.setCaption("Amount of selected items"); + label.setId("count"); + + tt.setImmediate(true); + tt.addContainerProperty("Foo", String.class, ""); + tt.setColumnWidth("Foo", 100); + tt.addContainerProperty("Bar", String.class, ""); + tt.setColumnWidth("Bar", 100); + tt.setHeight(400, PIXELS); + Object item1 = tt.addItem(new Object[]{"Foo", "Bar"}, null); + Object item2 = tt.addItem(new Object[]{"Foo2", "Bar2"}, null); + Object item3 = tt.addItem(new Object[]{"Foo3", "Bar3"}, null); + tt.setParent(item2, item1); + tt.setParent(item3, item1); + tt.setCollapsed(item1, false); + tt.setSelectable(true); + tt.setMultiSelect(true); + tt.setMultiSelectTouchDetectionEnabled(false); + tt.setWidth("400px"); + tt.setHeight("400px"); + tt.addValueChangeListener(new Property.ValueChangeListener() { + @Override + public void valueChange(Property.ValueChangeEvent event) { + Property property = event.getProperty(); + Set set = (Set) property.getValue(); + label.setValue("" + set.size()); + } + }); + + addComponent(tt); + addComponent(label); + } + + @Override + public String getDescription() { + return "Allow disabling multi selection's touch screen detection for hybrid devices"; + } + + @Override + protected Integer getTicketNumber() { + return 11601; + } + +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java index 532b6929ae..d71d954868 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboBoxClosePopupRetainTextTest.java @@ -34,7 +34,7 @@ public class ComboBoxClosePopupRetainTextTest extends MultiBrowserTest { ComboBoxElement cb = $(ComboBoxElement.class).first(); cb.selectByText("Item 3"); WebElement textbox = cb.findElement(By.vaadin("#textbox")); - textbox.clear(); + cb.clear(); textbox.sendKeys("I"); cb.openPopup(); // Entered value should remain in the text field even though the popup diff --git a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java index 98651437e0..bdb47da998 100644 --- a/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java +++ b/uitest/src/test/java/com/vaadin/tests/components/combobox/ComboboxMenuBarAutoopenTest.java @@ -20,6 +20,7 @@ public class ComboboxMenuBarAutoopenTest extends MultiBrowserTest { @Test public void closeComboboxPopupOnClickToMenuBar() { + setDebug(true); openTestURL(); openPopup(); diff --git a/uitest/src/test/java/com/vaadin/tests/components/table/CtrlShiftMultiselectTouchDetectionDisabledTest.java b/uitest/src/test/java/com/vaadin/tests/components/table/CtrlShiftMultiselectTouchDetectionDisabledTest.java new file mode 100644 index 0000000000..485c257bd1 --- /dev/null +++ b/uitest/src/test/java/com/vaadin/tests/components/table/CtrlShiftMultiselectTouchDetectionDisabledTest.java @@ -0,0 +1,46 @@ +package com.vaadin.tests.components.table; + +import com.vaadin.testbench.elements.LabelElement; +import com.vaadin.testbench.elements.TableElement; +import com.vaadin.testbench.parallel.Browser; +import com.vaadin.tests.tb3.MultiBrowserTest; +import org.junit.Test; +import org.openqa.selenium.Keys; +import org.openqa.selenium.interactions.Actions; +import org.openqa.selenium.remote.DesiredCapabilities; + +import java.util.List; + +import static org.junit.Assert.assertEquals; + +public class CtrlShiftMultiselectTouchDetectionDisabledTest extends MultiBrowserTest { + + @Override + public List<DesiredCapabilities> getBrowsersToTest() { + return getBrowserCapabilities(Browser.IE11); + } + + @Override + protected boolean requireWindowFocusForIE() { + return true; + } + + @Test + public void testSelectedCount() { + openTestURL(); + clickRow(3); + new Actions(driver).keyDown(Keys.SHIFT).perform(); + clickRow(8); + new Actions(driver).keyUp(Keys.SHIFT).perform(); + new Actions(driver).release().perform(); + LabelElement labelElement = $(LabelElement.class).id("count"); + assertEquals("6", labelElement.getText()); + + } + + private void clickRow(int index) { + TableElement tableElement = $(TableElement.class).first(); + tableElement.getRow(index).click(); + } + +} diff --git a/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableMultiselectTest.java b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableMultiselectTest.java new file mode 100644 index 0000000000..7ba8149189 --- /dev/null +++ b/uitest/src/test/java/com/vaadin/tests/components/treetable/TreeTableMultiselectTest.java @@ -0,0 +1,46 @@ +package com.vaadin.tests.components.treetable; + +import com.vaadin.testbench.elements.LabelElement; +import com.vaadin.testbench.elements.TreeTableElement; +import com.vaadin.testbench.parallel.Browser; +import com.vaadin.tests.tb3.MultiBrowserTest; +import org.junit.Test; +import org.openqa.selenium.Keys; +import org.openqa.selenium.interactions.Actions; +import org.openqa.selenium.remote.DesiredCapabilities; + +import java.util.List; + +import static org.junit.Assert.assertEquals; + +public class TreeTableMultiselectTest extends MultiBrowserTest { + + + @Override + public List<DesiredCapabilities> getBrowsersToTest() { + return getBrowserCapabilities(Browser.IE11); + } + + @Override + protected boolean requireWindowFocusForIE() { + return true; + } + + @Test + public void testSelectedCount() { + openTestURL(); + clickRow(0); + new Actions(driver).keyDown(Keys.SHIFT).perform(); + clickRow(1); + new Actions(driver).keyUp(Keys.SHIFT).perform(); + new Actions(driver).release().perform(); + LabelElement labelElement = $(LabelElement.class).id("count"); + assertEquals("2", labelElement.getText()); + } + + private void clickRow(int index) { + TreeTableElement treeTable = $(TreeTableElement.class).first(); + treeTable.getRow(index).click(); + } + +} |