diff options
author | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-04-14 11:14:32 +0000 |
---|---|---|
committer | Vaadin Code Review <review@vaadin.com> | 2014-04-14 12:05:45 +0000 |
commit | 168de1fefa0f09b07d438968575033e6d234cfb2 (patch) | |
tree | 833b7848d77d0f194f779af88a5e479f90d5524e /uitest/src/com | |
parent | 35e2a34c9c4dfcf9117db31f6403401129c9befc (diff) | |
download | vaadin-framework-168de1fefa0f09b07d438968575033e6d234cfb2.tar.gz vaadin-framework-168de1fefa0f09b07d438968575033e6d234cfb2.zip |
Revert "Drag image for text-area should contain text of text-area (#13557)"
This reverts commit f227f0c1068f17e5491bd399d9f5bde16a0c8272.
Synchronising content after IE wraps the given element into a table with
a body causes a NullPointerException on client side.
This patch also contains new API and should be targeted to master branch.
Change-Id: Ia19acd9fa31c7b67507bf797a2bab7c28ea37b4b
Diffstat (limited to 'uitest/src/com')
-rw-r--r-- | uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextArea.java | 56 | ||||
-rw-r--r-- | uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextAreaTest.java | 61 |
2 files changed, 0 insertions, 117 deletions
diff --git a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextArea.java b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextArea.java deleted file mode 100644 index 410eb21170..0000000000 --- a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextArea.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.draganddropwrapper; - -import com.vaadin.server.VaadinRequest; -import com.vaadin.tests.components.AbstractTestUI; -import com.vaadin.ui.DragAndDropWrapper; -import com.vaadin.ui.DragAndDropWrapper.DragStartMode; -import com.vaadin.ui.TextArea; -import com.vaadin.ui.VerticalLayout; - -/** - * Test UI for text area: drag image should contain text-area text. - * - * @since 7.1 - * @author Vaadin Ltd - */ -public class DragAndDropTextArea extends AbstractTestUI { - - @Override - protected void setup(VaadinRequest request) { - VerticalLayout dndLayout = new VerticalLayout(); - - TextArea area = new TextArea(); - area.setValue("text"); - - dndLayout.addComponent(area); - DragAndDropWrapper wrapper = new DragAndDropWrapper(dndLayout); - wrapper.setDragStartMode(DragStartMode.WRAPPER); - addComponent(wrapper); - } - - @Override - protected String getTestDescription() { - return "Drag image for textarea should contain text-area text"; - } - - @Override - protected Integer getTicketNumber() { - return 13557; - } - -} diff --git a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextAreaTest.java b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextAreaTest.java deleted file mode 100644 index 2abf3599ac..0000000000 --- a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragAndDropTextAreaTest.java +++ /dev/null @@ -1,61 +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.draganddropwrapper; - -import java.util.List; - -import org.junit.Assert; -import org.junit.Test; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.interactions.Actions; - -import com.vaadin.testbench.By; -import com.vaadin.tests.tb3.MultiBrowserTest; - -/** - * Test for drag image of text area which should contain text-area text. - * - * @since 7.1 - * @author Vaadin Ltd - */ -public class DragAndDropTextAreaTest extends MultiBrowserTest { - - @Test - public void testTextAreaDndImage() { - openTestURL(); - - WebElement wrapper = driver.findElement(By - .className("v-verticallayout")); - Actions actions = new Actions(driver); - actions.clickAndHold(wrapper); - actions.moveByOffset(50, 50); - actions.perform(); - - WebElement dragElement = driver.findElement(By - .className("v-drag-element")); - List<WebElement> children = dragElement.findElements(By.xpath(".//*")); - boolean found = false; - for (WebElement child : children) { - if ("text".equals(child.getAttribute("value"))) { - found = true; - } - } - - Assert.assertTrue( - "Text value is not found in the DnD image of text area", found); - } - -} |