]> 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: 01aea64)
Attempt to make TreeConnectors test less random in IE6
authorArtur Signell <artur.signell@itmill.com>
Fri, 7 Oct 2011 07:07:58 +0000 (07:07 +0000)
committerArtur Signell <artur.signell@itmill.com>
Fri, 7 Oct 2011 07:07:58 +0000 (07:07 +0000)
svn changeset:21629/svn branch:6.7

tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-base.html [new file with mode: 0644] patch | blob
tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-chameleon.html [new file with mode: 0644] patch | blob
tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-reindeer.html [new file with mode: 0644] patch | blob
tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-runo.html [new file with mode: 0644] patch | blob
tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.html [deleted file] patch | blob | history
tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.java patch | blob | history

diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-base.html b/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-base.html
new file mode 100644 (file)
index 0000000..8b9aaab
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-base.html
@@ -0,0 +1,36 @@
+<?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>TreeConnectors</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">TreeConnectors</td></tr>
+</thead><tbody>
+<tr>
+       <td>open</td>
+       <td>/run/TreeConnectors?theme=base&amp;restartApplication</td>
+       <td></td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td>default</td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>vaadin=runTreeConnectors::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VCheckBox[0]/domChild[0]</td>
+       <td>7,13</td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td>connectors</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-chameleon.html b/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-chameleon.html
new file mode 100644 (file)
index 0000000..0200c31
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-chameleon.html
@@ -0,0 +1,36 @@
+<?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>TreeConnectors</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">TreeConnectors</td></tr>
+</thead><tbody>
+<tr>
+       <td>open</td>
+       <td>/run/TreeConnectors?theme=chameleon&amp;restartApplication</td>
+       <td></td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td>default</td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>vaadin=runTreeConnectors::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VCheckBox[0]/domChild[0]</td>
+       <td>7,13</td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td>connectors</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-reindeer.html b/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-reindeer.html
new file mode 100644 (file)
index 0000000..f69dde7
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-reindeer.html
@@ -0,0 +1,36 @@
+<?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>TreeConnectors</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">TreeConnectors</td></tr>
+</thead><tbody>
+<tr>
+       <td>open</td>
+       <td>/run/TreeConnectors?theme=reindeer&amp;restartApplication</td>
+       <td></td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td>default</td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>vaadin=runTreeConnectors::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VCheckBox[0]/domChild[0]</td>
+       <td>7,13</td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td>connectors</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-runo.html b/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-runo.html
new file mode 100644 (file)
index 0000000..46d12bf
--- /dev/null
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors-runo.html
@@ -0,0 +1,36 @@
+<?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>TreeConnectors</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">TreeConnectors</td></tr>
+</thead><tbody>
+<tr>
+       <td>open</td>
+       <td>/run/TreeConnectors?theme=runo&amp;restartApplication</td>
+       <td></td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td>default</td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>vaadin=runTreeConnectors::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VCheckBox[0]/domChild[0]</td>
+       <td>7,13</td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td>connectors</td>
+</tr>
+</tbody></table>
+</body>
+</html>
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.html b/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.html
deleted file mode 100644 (file)
index b76c65f..0000000
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.html
+++ /dev/null
@@ -1,67 +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>TreeConnectors</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">TreeConnectors</td></tr>
-</thead><tbody>
-<tr>
-       <td>open</td>
-       <td>/run/TreeConnectors?theme=base</td>
-       <td></td>
-</tr>
-<tr>
-       <td>screenCapture</td>
-       <td></td>
-       <td>base</td>
-</tr>
-<tr>
-       <td>open</td>
-       <td>/run/TreeConnectors?theme=reindeer</td>
-       <td></td>
-</tr>
-<tr>
-       <td>screenCapture</td>
-       <td></td>
-       <td>reindeer</td>
-</tr>
-<tr>
-       <td>open</td>
-       <td>/run/TreeConnectors?theme=runo</td>
-       <td></td>
-</tr>
-<tr>
-       <td>screenCapture</td>
-       <td></td>
-       <td>runo</td>
-</tr>
-<tr>
-       <td>open</td>
-       <td>/run/TreeConnectors?theme=liferay</td>
-       <td></td>
-</tr>
-<tr>
-       <td>screenCapture</td>
-       <td></td>
-       <td>liferay</td>
-</tr>
-<tr>
-       <td>open</td>
-       <td>/run/TreeConnectors?theme=chameleon</td>
-       <td></td>
-</tr>
-<tr>
-       <td>screenCapture</td>
-       <td></td>
-       <td>chameleon</td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.java b/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.java
index 81c6d2df9e9ece6f24473d5b0373ea021f99170e..b37d371b170bec0481b08113ab4b2bb21465bd45 100644 (file)
--- a/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.java
+++ b/tests/testbench/com/vaadin/tests/components/tree/TreeConnectors.java
@@ -1,6 +1,8 @@
 package com.vaadin.tests.components.tree;
 
 import com.vaadin.data.Item;
+import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.data.Property.ValueChangeListener;
 import com.vaadin.data.util.HierarchicalContainer;
 import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DropHandler;
@@ -8,7 +10,7 @@ import com.vaadin.event.dd.acceptcriteria.AcceptAll;
 import com.vaadin.event.dd.acceptcriteria.AcceptCriterion;
 import com.vaadin.terminal.ThemeResource;
 import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.CheckBox;
 import com.vaadin.ui.Tree;
 import com.vaadin.ui.Tree.TreeDragMode;
 import com.vaadin.ui.themes.BaseTheme;
@@ -16,17 +18,25 @@ import com.vaadin.ui.themes.BaseTheme;
 @SuppressWarnings("serial")
 public class TreeConnectors extends TestBase {
 
+    private Tree tree = createTree();
+
     @Override
     protected void setup() {
-        HorizontalLayout l = new HorizontalLayout();
-        l.setSpacing(true);
-
-        l.addComponent(createTree());
-        Tree connectors = createTree();
-        connectors.addStyleName(BaseTheme.TREE_CONNECTORS);
-        l.addComponent(connectors);
-
-        addComponent(l);
+        CheckBox cb = new CheckBox("Connectors");
+        cb.setValue(false);
+        cb.setImmediate(true);
+        cb.addListener(new ValueChangeListener() {
+
+            public void valueChange(ValueChangeEvent event) {
+                if ((Boolean) event.getProperty().getValue()) {
+                    tree.addStyleName(BaseTheme.TREE_CONNECTORS);
+                } else {
+                    tree.removeStyleName(BaseTheme.TREE_CONNECTORS);
+                }
+            }
+        });
+        addComponent(cb);
+        addComponent(tree);
     }
 
     private Tree createTree() {
@@ -61,8 +71,6 @@ public class TreeConnectors extends TestBase {
                 "../runo/icons/64/users.png"));
         tree.setItemIcon("Item 17", new ThemeResource(
                 "../runo/icons/16/document-pdf.png"));
-        tree.setItemIcon("Item 6", new ThemeResource(
-                "../runo/icons/16/folder-add.png"));
 
         return tree;
     }
Vaadin 6, 7, 8 is a Java framework for modern Java web applications: https://github.com/vaadin/framework