diff options
| author | Artur Signell <artur.signell@itmill.com> | 2010-11-25 15:52:31 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2010-11-25 15:52:31 +0000 |
| commit | f1d8ef2ce961640620394ae734758f867bf2d816 (patch) | |
| tree | dc442d3c5b23d8d0400cf793377ab9e253d32440 /tests/src | |
| parent | 976eab68767a2a69183073cc360ba3c117161e92 (diff) | |
| download | vaadin-framework-f1d8ef2ce961640620394ae734758f867bf2d816.tar.gz vaadin-framework-f1d8ef2ce961640620394ae734758f867bf2d816.zip | |
Tests for #6060 and #6061
svn changeset:16165/svn branch:6.5
Diffstat (limited to 'tests/src')
4 files changed, 190 insertions, 0 deletions
diff --git a/tests/src/com/vaadin/tests/components/absolutelayout/MoveComponentFromAbsoluteLayoutToInnerLayout.html b/tests/src/com/vaadin/tests/components/absolutelayout/MoveComponentFromAbsoluteLayoutToInnerLayout.html new file mode 100644 index 0000000000..e1fbf29b37 --- /dev/null +++ b/tests/src/com/vaadin/tests/components/absolutelayout/MoveComponentFromAbsoluteLayoutToInnerLayout.html @@ -0,0 +1,37 @@ +<?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>New Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">New Test</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/run/com.vaadin.tests.components.absolutelayout.MoveComponentsFromAbsoluteLayoutToInnerLayout?restartApplication</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>vaadin=runcomvaadintestscomponentsabsolutelayoutMoveComponentsFromAbsoluteLayoutToInnerLayout::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VAbsoluteLayout[0]/VAbsoluteLayout$AbsoluteWrapper[0]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>vaadin=runcomvaadintestscomponentsabsolutelayoutMoveComponentsFromAbsoluteLayoutToInnerLayout::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td>buttons-with-captions</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/src/com/vaadin/tests/components/absolutelayout/MoveComponentsFromAbsoluteLayoutToInnerLayout.java b/tests/src/com/vaadin/tests/components/absolutelayout/MoveComponentsFromAbsoluteLayoutToInnerLayout.java new file mode 100644 index 0000000000..9082842b1c --- /dev/null +++ b/tests/src/com/vaadin/tests/components/absolutelayout/MoveComponentsFromAbsoluteLayoutToInnerLayout.java @@ -0,0 +1,58 @@ +package com.vaadin.tests.components.absolutelayout;
+
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.AbsoluteLayout;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.ComponentContainer;
+import com.vaadin.ui.VerticalLayout;
+
+public class MoveComponentsFromAbsoluteLayoutToInnerLayout extends TestBase {
+
+ protected Button testButton;
+ private AbsoluteLayout al;
+ protected ComponentContainer vl;
+
+ @Override
+ protected void setup() {
+ al = new AbsoluteLayout();
+ al.setWidth("200px");
+ al.setHeight("200px");
+
+ testButton = new Button("Click to move to inner layout",
+ new Button.ClickListener() {
+
+ public void buttonClick(ClickEvent event) {
+ vl.addComponent(testButton);
+ }
+ });
+
+ al.addComponent(testButton);
+
+ vl = new VerticalLayout();
+ al.addComponent(vl, "top: 100px");
+
+ addComponent(al);
+
+ Button b = new Button("Repaint inner layout",
+ new Button.ClickListener() {
+
+ public void buttonClick(ClickEvent event) {
+ vl.requestRepaint();
+ }
+ });
+
+ addComponent(b);
+ }
+
+ @Override
+ protected String getDescription() {
+ return "Click the first button to move it from an outer layout to an inner. Then click the second button to repaint the inner layout.";
+ }
+
+ @Override
+ protected Integer getTicketNumber() {
+ return 6061;
+ }
+
+}
diff --git a/tests/src/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.html b/tests/src/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.html new file mode 100644 index 0000000000..528e3fb379 --- /dev/null +++ b/tests/src/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.html @@ -0,0 +1,37 @@ +<?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>New Test</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">New Test</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/run/com.vaadin.tests.components.gridlayout.MoveComponentsFromGridLayoutToInnerLayout?restartApplication</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>vaadin=runcomvaadintestscomponentsgridlayoutMoveComponentsFromGridLayoutToInnerLayout::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>click</td>
+ <td>vaadin=runcomvaadintestscomponentsgridlayoutMoveComponentsFromGridLayoutToInnerLayout::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td>buttons-with-captions</td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/src/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java b/tests/src/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java new file mode 100644 index 0000000000..08a37dcd9a --- /dev/null +++ b/tests/src/com/vaadin/tests/components/gridlayout/MoveComponentsFromGridLayoutToInnerLayout.java @@ -0,0 +1,58 @@ +package com.vaadin.tests.components.gridlayout;
+
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.ComponentContainer;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.VerticalLayout;
+
+public class MoveComponentsFromGridLayoutToInnerLayout extends TestBase {
+
+ protected Button testButton;
+ private GridLayout gl;
+ protected ComponentContainer vl;
+
+ @Override
+ protected void setup() {
+ gl = new GridLayout();
+ gl.setWidth("200px");
+ gl.setHeight("200px");
+
+ testButton = new Button("Click to move to inner layout",
+ new Button.ClickListener() {
+
+ public void buttonClick(ClickEvent event) {
+ vl.addComponent(testButton);
+ }
+ });
+
+ gl.addComponent(testButton);
+
+ vl = new VerticalLayout();
+ gl.addComponent(vl);
+
+ addComponent(gl);
+
+ Button b = new Button("Repaint inner layout",
+ new Button.ClickListener() {
+
+ public void buttonClick(ClickEvent event) {
+ vl.requestRepaint();
+ }
+ });
+
+ addComponent(b);
+ }
+
+ @Override
+ protected String getDescription() {
+ return "Click the first button to move it from an outer layout to an inner. Then click the second button to repaint the inner layout.";
+ }
+
+ @Override
+ protected Integer getTicketNumber() {
+ return 6060;
+ }
+
+}
|