]> source.dussan.org Git - vaadin-framework.git/commitdiff
projects / vaadin-framework.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a26f6d7)
Moved window tooltip test from components/ to components/window/ (#9172)
authorJohannes Dahlström <johannesd@vaadin.com>
Fri, 27 Jul 2012 11:12:07 +0000 (14:12 +0300)
committerJohannes Dahlström <johannesd@vaadin.com>
Fri, 27 Jul 2012 11:12:53 +0000 (14:12 +0300)
tests/testbench/com/vaadin/tests/components/TooltipInWindow.html [deleted file] patch | blob | history
tests/testbench/com/vaadin/tests/components/TooltipInWindow.java [deleted file] patch | blob | history
tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.html [new file with mode: 0644] patch | blob
tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.java [new file with mode: 0644] patch | blob

diff --git a/tests/testbench/com/vaadin/tests/components/TooltipInWindow.html b/tests/testbench/com/vaadin/tests/components/TooltipInWindow.html
deleted file mode 100644 (file)
index 2915bb0..0000000
--- a/tests/testbench/com/vaadin/tests/components/TooltipInWindow.html
+++ /dev/null
@@ -1,69 +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>integration-test-liferay-5.2.3-portlet2</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">integration-test-liferay-5.2.3-portlet2</td></tr>
-</thead><tbody>
-<tr>
-       <td>open</td>
-       <td>/run/com.vaadin.tests.components.TooltipInWindow?restartApplication</td>
-       <td></td>
-</tr>
-<!--Show tooltip in Root-->
-<tr>
-       <td>showTooltip</td>
-       <td>vaadin=runcomvaadintestscomponentsTooltipInWindow::/VVerticalLayout[0]/VVerticalLayout[0]/VTextField[0]</td>
-       <td>5,5</td>
-</tr>
-<tr>
-       <td>pause</td>
-       <td>1000</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentsTooltipInWindow::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td>
-       <td>My tooltip</td>
-</tr>
-<!--Hide the tooltip-->
-<tr>
-       <td>showTooltip</td>
-       <td>vaadin=runcomvaadintestscomponentsTooltipInWindow::/VVerticalLayout[0]</td>
-       <td>0,0</td>
-</tr>
-<tr>
-       <td>pause</td>
-       <td>1000</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertElementNotPresent</td>
-       <td>vaadin=runcomvaadintestscomponentsTooltipInWindow::Root/VTooltip[0]</td>
-       <td></td>
-</tr>
-<!--Show tooltip in Window-->
-<tr>
-       <td>showTooltip</td>
-       <td>vaadin=runcomvaadintestscomponentsTooltipInWindow::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/VTextField[0]</td>
-       <td>5,5</td>
-</tr>
-<tr>
-       <td>pause</td>
-       <td>1000</td>
-       <td></td>
-</tr>
-<tr>
-       <td>assertText</td>
-       <td>vaadin=runcomvaadintestscomponentsTooltipInWindow::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td>
-       <td>My tooltip</td>
-</tr>
-</tbody></table>
-</body>
-</html>
diff --git a/tests/testbench/com/vaadin/tests/components/TooltipInWindow.java b/tests/testbench/com/vaadin/tests/components/TooltipInWindow.java
deleted file mode 100644 (file)
index 9d0b7bc..0000000
--- a/tests/testbench/com/vaadin/tests/components/TooltipInWindow.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/* 
-@VaadinApache2LicenseForJavaFiles@
- */
-
-package com.vaadin.tests.components;
-
-import com.vaadin.terminal.WrappedRequest;
-import com.vaadin.ui.TextField;
-import com.vaadin.ui.Window;
-
-public class TooltipInWindow extends AbstractTestRoot {
-
-    @Override
-    protected void setup(WrappedRequest request) {
-        Window window = new Window("Window");
-        window.getContent().setSizeUndefined();
-        window.center();
-        window.addComponent(createTextField());
-
-        addWindow(window);
-        addComponent(createTextField());
-    }
-
-    private TextField createTextField() {
-        TextField tf = new TextField("TextField with a tooltip");
-        tf.setDescription("My tooltip");
-        return tf;
-    }
-
-    @Override
-    protected String getTestDescription() {
-        return "Tooltips should also work in a Window (as well as in other overlays)";
-    }
-
-    @Override
-    protected Integer getTicketNumber() {
-        return Integer.valueOf(9172);
-    }
-
-}
diff --git a/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.html b/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.html
new file mode 100644 (file)
index 0000000..2915bb0
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.html
@@ -0,0 +1,69 @@
+<?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>integration-test-liferay-5.2.3-portlet2</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">integration-test-liferay-5.2.3-portlet2</td></tr>
+</thead><tbody>
+<tr>
+       <td>open</td>
+       <td>/run/com.vaadin.tests.components.TooltipInWindow?restartApplication</td>
+       <td></td>
+</tr>
+<!--Show tooltip in Root-->
+<tr>
+       <td>showTooltip</td>
+       <td>vaadin=runcomvaadintestscomponentsTooltipInWindow::/VVerticalLayout[0]/VVerticalLayout[0]/VTextField[0]</td>
+       <td>5,5</td>
+</tr>
+<tr>
+       <td>pause</td>
+       <td>1000</td>
+       <td></td>
+</tr>
+<tr>
+       <td>assertText</td>
+       <td>vaadin=runcomvaadintestscomponentsTooltipInWindow::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td>
+       <td>My tooltip</td>
+</tr>
+<!--Hide the tooltip-->
+<tr>
+       <td>showTooltip</td>
+       <td>vaadin=runcomvaadintestscomponentsTooltipInWindow::/VVerticalLayout[0]</td>
+       <td>0,0</td>
+</tr>
+<tr>
+       <td>pause</td>
+       <td>1000</td>
+       <td></td>
+</tr>
+<tr>
+       <td>assertElementNotPresent</td>
+       <td>vaadin=runcomvaadintestscomponentsTooltipInWindow::Root/VTooltip[0]</td>
+       <td></td>
+</tr>
+<!--Show tooltip in Window-->
+<tr>
+       <td>showTooltip</td>
+       <td>vaadin=runcomvaadintestscomponentsTooltipInWindow::/VWindow[0]/FocusableScrollPanel[0]/VVerticalLayout[0]/VTextField[0]</td>
+       <td>5,5</td>
+</tr>
+<tr>
+       <td>pause</td>
+       <td>1000</td>
+       <td></td>
+</tr>
+<tr>
+       <td>assertText</td>
+       <td>vaadin=runcomvaadintestscomponentsTooltipInWindow::Root/VTooltip[0]/FlowPanel[0]/domChild[1]</td>
+       <td>My tooltip</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.java b/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.java
new file mode 100644 (file)
index 0000000..9d0b7bc
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/window/TooltipInWindow.java
@@ -0,0 +1,40 @@
+/* 
+@VaadinApache2LicenseForJavaFiles@
+ */
+
+package com.vaadin.tests.components;
+
+import com.vaadin.terminal.WrappedRequest;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Window;
+
+public class TooltipInWindow extends AbstractTestRoot {
+
+    @Override
+    protected void setup(WrappedRequest request) {
+        Window window = new Window("Window");
+        window.getContent().setSizeUndefined();
+        window.center();
+        window.addComponent(createTextField());
+
+        addWindow(window);
+        addComponent(createTextField());
+    }
+
+    private TextField createTextField() {
+        TextField tf = new TextField("TextField with a tooltip");
+        tf.setDescription("My tooltip");
+        return tf;
+    }
+
+    @Override
+    protected String getTestDescription() {
+        return "Tooltips should also work in a Window (as well as in other overlays)";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return Integer.valueOf(9172);
+    }
+
+}
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework