]> source.dussan.org Git - vaadin-framework.git/commitdiff
Replace DragStartModes TB2 test with TB3 test
authorTeemu Suo-Anttila <teemusa@vaadin.com>
Wed, 16 Apr 2014 12:13:26 +0000 (15:13 +0300)
committerTeemu Suo-Anttila <teemusa@vaadin.com>
Tue, 29 Apr 2014 10:51:33 +0000 (10:51 +0000)
Change-Id: Ief8c36aeeff2026b4beb7d73ab61f13721a2fd4f

uitest/src/com/vaadin/tests/components/draganddropwrapper/DragStartModes.html [deleted file]
uitest/src/com/vaadin/tests/components/draganddropwrapper/DragStartModesTest.java [new file with mode: 0644]

diff --git a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragStartModes.html b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragStartModes.html
deleted file mode 100644 (file)
index 3e7a7cb..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-<?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="" />
-<title>DragStartModes</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">DragStartModes</td></tr>
-</thead><tbody>
-<tr>
-       <td>open</td>
-       <td>/run/com.vaadin.tests.components.draganddropwrapper.DragStartModes?restartApplication</td>
-       <td></td>
-</tr>
-<tr>
-       <td>drag</td>
-       <td>vaadin=runcomvaadintestscomponentsdraganddropwrapperDragStartModes::PID_SlabelCOMPONENT</td>
-       <td>50,10</td>
-</tr>
-<tr>
-       <td>mouseMoveAt</td>
-       <td>vaadin=runcomvaadintestscomponentsdraganddropwrapperDragStartModes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VLabel[0]</td>
-       <td>50,10</td>
-</tr>
-<tr>
-       <td>screenCapture</td>
-       <td></td>
-       <td>drag-mode-component</td>
-</tr>
-<tr>
-       <td>drop</td>
-       <td>vaadin=runcomvaadintestscomponentsdraganddropwrapperDragStartModes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VLabel[0]</td>
-       <td>50,10</td>
-</tr>
-<tr>
-       <td>drag</td>
-       <td>vaadin=runcomvaadintestscomponentsdraganddropwrapperDragStartModes::PID_SlabelWRAPPER</td>
-       <td>50,10</td>
-</tr>
-<tr>
-       <td>mouseMoveAt</td>
-       <td>vaadin=runcomvaadintestscomponentsdraganddropwrapperDragStartModes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VLabel[0]</td>
-       <td>50,10</td>
-</tr>
-<tr>
-       <td>screenCapture</td>
-       <td></td>
-       <td>drag-mode-wrapper</td>
-</tr>
-<tr>
-       <td>drop</td>
-       <td>vaadin=runcomvaadintestscomponentsdraganddropwrapperDragStartModes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VLabel[0]</td>
-       <td>50,10</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragStartModesTest.java b/uitest/src/com/vaadin/tests/components/draganddropwrapper/DragStartModesTest.java
new file mode 100644 (file)
index 0000000..25aef1b
--- /dev/null
@@ -0,0 +1,46 @@
+/*
+ * 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.draganddropwrapper;
+
+import java.io.IOException;
+
+import org.junit.Test;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.interactions.Actions;
+
+import com.vaadin.tests.tb3.MultiBrowserTest;
+
+public class DragStartModesTest extends MultiBrowserTest {
+
+    @Test
+    public void testDragStartModes() throws IOException {
+        openTestURL();
+        WebElement dropTarget = vaadinElement("/VVerticalLayout[0]/VVerticalLayout[0]/VLabel[0]");
+        dragToTarget("COMPONENT", dropTarget);
+        dragToTarget("WRAPPER", dropTarget);
+    }
+
+    private void dragToTarget(String dragMode, WebElement dropTarget)
+            throws IOException {
+        WebElement draggable = vaadinElementById("label" + dragMode);
+        new Actions(driver).moveToElement(draggable, 10, 10).clickAndHold()
+                .moveByOffset(5, 0).perform();
+        new Actions(driver).moveToElement(dropTarget, 12, 10).perform();
+        compareScreen("dragMode" + dragMode);
+        new Actions(driver).release().perform();
+    }
+
+}