aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJohannes Dahlström <johannes.dahlstrom@vaadin.com>2012-07-09 11:02:15 +0000
committerJohannes Dahlström <johannes.dahlstrom@vaadin.com>2012-07-09 11:02:15 +0000
commit4d543d3ecb83630a00cf07437655b1311320dc67 (patch)
treea7ed49491b80c980b54118f4bfe572eb186b7c4d /tests
parent3aab8e558b60088bb6dca5e75a320ef3dc6b0aba (diff)
downloadvaadin-framework-4d543d3ecb83630a00cf07437655b1311320dc67.tar.gz
vaadin-framework-4d543d3ecb83630a00cf07437655b1311320dc67.zip
TB test for #7387
svn changeset:23996/svn branch:6.8
Diffstat (limited to 'tests')
-rw-r--r--tests/testbench/com/vaadin/tests/components/treetable/ComponentsInTreeTable.html32
-rw-r--r--tests/testbench/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java25
2 files changed, 45 insertions, 12 deletions
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ComponentsInTreeTable.html b/tests/testbench/com/vaadin/tests/components/treetable/ComponentsInTreeTable.html
new file mode 100644
index 0000000000..05c5986e6b
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/treetable/ComponentsInTreeTable.html
@@ -0,0 +1,32 @@
+<?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>ComponentsInTreeTable</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">ComponentsInTreeTable</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/run/com.vaadin.tests.components.treetable.ComponentsInTreeTable?restartApplication</td>
+ <td></td>
+</tr>
+<tr>
+ <td>mouseClick</td>
+ <td>vaadin=runcomvaadintestscomponentstreetableComponentsInTreeTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTreeTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]</td>
+ <td>15,7</td>
+</tr>
+<tr>
+ <td>screenCapture</td>
+ <td></td>
+ <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java b/tests/testbench/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java
index 5b7700bc6e..8ff80204cc 100644
--- a/tests/testbench/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java
+++ b/tests/testbench/com/vaadin/tests/components/treetable/ComponentsInTreeTable.java
@@ -7,6 +7,7 @@ import com.vaadin.ui.HorizontalLayout;
import com.vaadin.ui.Label;
import com.vaadin.ui.Layout;
import com.vaadin.ui.TreeTable;
+import com.vaadin.ui.VerticalLayout;
public class ComponentsInTreeTable extends TestBase {
@@ -14,28 +15,28 @@ public class ComponentsInTreeTable extends TestBase {
protected void setup() {
TreeTable tt = new TreeTable();
tt.setWidth("300px");
+ tt.setHeight("300px");
addComponent(tt);
- Object id, id2;
+ tt.addContainerProperty("component", Component.class, "");
+ tt.addContainerProperty("type", String.class, "bar");
- tt.addContainerProperty("foo", Component.class, "");
- tt.addContainerProperty("bar", String.class, "bar");
- tt.addContainerProperty("baz", String.class, "baz");
-
- id = tt.addItem();
Layout l = new HorizontalLayout();
l.addComponent(new Label("bar"));
l.addComponent(new Label("bar"));
- tt.getContainerProperty(id, "foo").setValue(l);
+ tt.addItem(new Object[] { l, "HorizontalLayout" }, 1);
+
+ l = new VerticalLayout();
+ l.addComponent(new Label("baz"));
+ l.addComponent(new Label("baz"));
+ tt.addItem(new Object[] { l, "VerticalLayout" }, 2);
- id = tt.addItem();
Label lbl = new Label("<b>foo</b><br/><i>bar</i>");
lbl.setContentMode(Label.CONTENT_XHTML);
- tt.getContainerProperty(id, "foo").setValue(lbl);
+ tt.addItem(new Object[] { lbl, "Label" }, 3);
- id2 = tt.addItem();
- tt.setParent(id2, id);
- tt.getContainerProperty(id2, "foo").setValue(new Button("Test"));
+ tt.addItem(new Object[] { new Button("Test"), "Button" }, 4);
+ tt.setParent(4, 3);
}
@Override