diff options
author | Teemu Pòˆntelin <teemu@vaadin.com> | 2014-08-26 19:29:35 +0300 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2014-09-19 10:12:06 +0000 |
commit | 47a1b8d641306a918b138588fe432f811e338507 (patch) | |
tree | 2d0f2c51b268363b865df218a21ed78127bf41c0 /uitest/src/com/vaadin/tests/components/combobox | |
parent | 43a523ae2d92e2230591fa654f49c1ac726148ef (diff) | |
download | vaadin-framework-47a1b8d641306a918b138588fe432f811e338507.tar.gz vaadin-framework-47a1b8d641306a918b138588fe432f811e338507.zip |
Fixed ComboBox filtering when page length is zero (#14509)
Change-Id: I663b39a37bcdf4383fa76d04acd127503ced11df
Diffstat (limited to 'uitest/src/com/vaadin/tests/components/combobox')
-rw-r--r-- | uitest/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLength.java | 54 | ||||
-rw-r--r-- | uitest/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java | 69 |
2 files changed, 123 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLength.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLength.java new file mode 100644 index 0000000000..f981b6fa07 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLength.java @@ -0,0 +1,54 @@ +/* + * Copyright 2000-2014 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.combobox; + +import java.util.Arrays; +import java.util.List; + +import com.vaadin.server.VaadinRequest; +import com.vaadin.shared.ui.combobox.FilteringMode; +import com.vaadin.tests.components.AbstractTestUI; +import com.vaadin.ui.ComboBox; + +public class ComboBoxSuggestionPageLength extends AbstractTestUI { + + private static List<String> items = Arrays.asList("abc", "cde", "efg", + "ghi", "ijk"); + + @Override + protected void setup(VaadinRequest request) { + ComboBox cb = new ComboBox("Page length 0", items); + cb.setPageLength(0); + cb.setFilteringMode(FilteringMode.CONTAINS); + addComponent(cb); + + cb = new ComboBox("Page length 2", items); + cb.setPageLength(2); + cb.setFilteringMode(FilteringMode.CONTAINS); + addComponent(cb); + } + + @Override + protected String getTestDescription() { + return "Filtering should also work when page length is set to zero."; + } + + @Override + protected Integer getTicketNumber() { + return 14509; + } + +} diff --git a/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java new file mode 100644 index 0000000000..7ed3268dd4 --- /dev/null +++ b/uitest/src/com/vaadin/tests/components/combobox/ComboBoxSuggestionPageLengthTest.java @@ -0,0 +1,69 @@ +/* + * Copyright 2000-2014 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.combobox; + +import static org.junit.Assert.assertEquals; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.junit.Test; +import org.openqa.selenium.WebElement; + +import com.vaadin.testbench.By; +import com.vaadin.testbench.elements.ComboBoxElement; +import com.vaadin.tests.tb3.MultiBrowserTest; + +public class ComboBoxSuggestionPageLengthTest extends MultiBrowserTest { + + @Test + public void testSuggestionsPageLength0() { + openTestURL(); + + WebElement textboxPageLength0 = $(ComboBoxElement.class).first() + .findElement(By.tagName("input")); + textboxPageLength0.sendKeys("c"); + assertSuggestions("abc", "cde"); + } + + @Test + public void testSuggestionsPageLength2() { + openTestURL(); + + WebElement textboxPageLength2 = $(ComboBoxElement.class).get(1) + .findElement(By.tagName("input")); + textboxPageLength2.sendKeys("e"); + assertSuggestions("cde", "efg"); + } + + private void assertSuggestions(String... expected) { + assertEquals(Arrays.asList(expected), getSuggestionsOnScreen()); + } + + private List<String> getSuggestionsOnScreen() { + List<WebElement> suggestionElements = getDriver() + .findElements( + By.cssSelector(".v-filterselect-suggestpopup .gwt-MenuItem span")); + + List<String> suggestions = new ArrayList<String>(); + for (WebElement suggestion : suggestionElements) { + suggestions.add(suggestion.getText()); + } + return suggestions; + } + +} |