diff options
author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-05-19 11:17:57 +0300 |
---|---|---|
committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-05-19 11:17:57 +0300 |
commit | 13ddd2b03c99b563b131c115982ac09453ca749f (patch) | |
tree | 3683794c17254b5ab7a3730ff6b4a3186999b185 /uitest/src/com/vaadin/tests/components/ui | |
parent | f2597f7496241bfb3836fce0c0d3d1aa90a2f6dc (diff) | |
download | vaadin-framework-13ddd2b03c99b563b131c115982ac09453ca749f.tar.gz vaadin-framework-13ddd2b03c99b563b131c115982ac09453ca749f.zip |
Move ComboBox tests to correct package
Change-Id: I2ad5164a637b2b4c96b46f30df036ccbc5cbcd66
Diffstat (limited to 'uitest/src/com/vaadin/tests/components/ui')
4 files changed, 0 insertions, 235 deletions
diff --git a/uitest/src/com/vaadin/tests/components/ui/ComboboxPageLengthZeroScroll.java b/uitest/src/com/vaadin/tests/components/ui/ComboboxPageLengthZeroScroll.java deleted file mode 100644 index 82c04191d1..0000000000 --- a/uitest/src/com/vaadin/tests/components/ui/ComboboxPageLengthZeroScroll.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2000-2013 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.ui; - -import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; -import com.vaadin.ui.Button; -import com.vaadin.ui.ComboBox; - -/** - * Test UI for issue #13488, where scrolling to the next page with pagelength 0 - * would break the rendering of any page except the first. - * - * @author Vaadin Ltd - */ -@SuppressWarnings("serial") -public class ComboboxPageLengthZeroScroll extends AbstractTestUI { - - @Override - protected void setup(VaadinRequest request) { - ComboBox combobox = new ComboBox("New items enabled:"); - combobox.setPageLength(0); - - for (int i = 0; i++ < 10;) { - combobox.addItem("1 AMERICAN SAMOA " + i); - combobox.addItem("ANTIGUA AND BARBUDA " + i); - } - - getLayout().addComponent(combobox); - getLayout().addComponent(new Button("dummy")); - } - - @Override - protected String getTestDescription() { - return "Scrolling with pagelength == 0 previously resulted in broken style, should be fixed now"; - } - - @Override - protected Integer getTicketNumber() { - return 13488; - } - -} diff --git a/uitest/src/com/vaadin/tests/components/ui/ComboboxPageLengthZeroScrollTest.java b/uitest/src/com/vaadin/tests/components/ui/ComboboxPageLengthZeroScrollTest.java deleted file mode 100644 index eecf83417e..0000000000 --- a/uitest/src/com/vaadin/tests/components/ui/ComboboxPageLengthZeroScrollTest.java +++ /dev/null @@ -1,63 +0,0 @@ -/* - * 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.ui; - -import org.junit.Assert; -import org.junit.Test; -import org.openqa.selenium.By; -import org.openqa.selenium.Keys; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.interactions.Actions; - -import com.vaadin.tests.tb3.MultiBrowserTest; - -/** - * Test class for testing issue #13488 - changing pages with pagelength=0 breaks - * the style. - * - * @author Vaadin Ltd - */ - -public class ComboboxPageLengthZeroScrollTest extends MultiBrowserTest { - @Test - public void testComboboxPageLength() { - openTestURL(); - - WebElement comboBox = vaadinElement("/VVerticalLayout[0]/Slot[1]/VVerticalLayout[0]/Slot[0]/VFilterSelect[0]#textbox"); - - // navigate to the next page. keyboard navigation is the preferred - // method here since it's much easier to implement. - - Actions keyNavigation = new Actions(driver).moveToElement(comboBox) - .click(); - - for (int i = 0; i < 25; ++i) { - keyNavigation.sendKeys(Keys.ARROW_DOWN); - - } - keyNavigation.perform(); - - // The broken behavior always caused a v-shadow element to have - // height: 10px. Verify that this does no longer happen. - - String cssValue = driver.findElement(By.className("v-shadow")) - .getCssValue("height"); - - Assert.assertNotEquals("v-shadow height should not be 10px", "10px", - cssValue); - - } -} diff --git a/uitest/src/com/vaadin/tests/components/ui/ComboboxStyleChangeWidth.java b/uitest/src/com/vaadin/tests/components/ui/ComboboxStyleChangeWidth.java deleted file mode 100644 index 6e5ca36f31..0000000000 --- a/uitest/src/com/vaadin/tests/components/ui/ComboboxStyleChangeWidth.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * 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.ui; - -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; - -/** - * Test UI for adding a stylename to a combobox with an undefined width. - * - * @author Vaadin Ltd - */ -public class ComboboxStyleChangeWidth extends AbstractTestUIWithLog { - - @Override - protected void setup(VaadinRequest request) { - final ComboBox cbFoo = new ComboBox(); - cbFoo.setImmediate(true); - cbFoo.setSizeUndefined(); - cbFoo.addItem("A really long string that causes an inline width to be set"); - - Button btn = new Button("Click to break CB", - new Button.ClickListener() { - @Override - public void buttonClick(ClickEvent event) { - cbFoo.addStyleName("foofoo"); - - } - }); - - addComponent(cbFoo); - addComponent(btn); - - } - - @Override - protected String getTestDescription() { - return "The computed inline width of an undefined-width ComboBox " - + "(with a sufficiently long option string) breaks when " - + "the component's stylename is changed after initial " - + "rendering."; - } - - @Override - protected Integer getTicketNumber() { - return Integer.valueOf(13444); - } - -} diff --git a/uitest/src/com/vaadin/tests/components/ui/ComboboxStyleChangeWidthTest.java b/uitest/src/com/vaadin/tests/components/ui/ComboboxStyleChangeWidthTest.java deleted file mode 100644 index c8299c110e..0000000000 --- a/uitest/src/com/vaadin/tests/components/ui/ComboboxStyleChangeWidthTest.java +++ /dev/null @@ -1,51 +0,0 @@ -/* - * 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.ui; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - -import com.vaadin.testbench.elements.ButtonElement; -import com.vaadin.testbench.elements.ComboBoxElement; -import com.vaadin.tests.tb3.MultiBrowserTest; - -/** - * Tests that changing a stylename will not cause the width parameter to be - * removed from a combobox. - * - * @author Vaadin Ltd - */ - -public class ComboboxStyleChangeWidthTest extends MultiBrowserTest { - - @Test - public void testWidthRetained() { - openTestURL(); - - ComboBoxElement comboBox = $(ComboBoxElement.class).first(); - String oldStyle = comboBox.getAttribute("style"); - - ButtonElement button = $(ButtonElement.class).first(); - button.click(); - String newStyle = comboBox.getAttribute("style"); - - assertEquals("width has changed, should remain equal", oldStyle, - newStyle); - - } - -} |