Merged test case, reference images updates

svn changeset:9244/svn branch:6.2
author: Artur Signell <artur.signell@itmill.com> 2009-10-19 11:09:44 +0000
committer: Artur Signell <artur.signell@itmill.com> 2009-10-19 11:09:44 +0000
commit: b26bec94b51103a0030658691f2669bfe9c44b1c (patch)
tree: d539e36f51897f7f3043d897bfc0da1ad8ceab34 /src
parent: 95dad56e345c7f7f0c96e9380f5345dfac89e5d0 (diff)
download: vaadin-framework-b26bec94b51103a0030658691f2669bfe9c44b1c.tar.gz
vaadin-framework-b26bec94b51103a0030658691f2669bfe9c44b1c.zip
8 files changed, 587 insertions, 30 deletions
diff --git a/src/com/vaadin/tests/components/combobox/ComboBoxValueInput.html b/src/com/vaadin/tests/components/combobox/ComboBoxValueInput.html
new file mode 100644
index 0000000000..2aab40f13f
--- /dev/null
+++ b/src/com/vaadin/tests/components/combobox/ComboBoxValueInput.html
@@ -0,0 +1,292 @@
+<?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>ComboBoxValueInput</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">ComboBoxValueInput</td></tr>
+</thead><tbody>
+<tr>
+	<td>open</td>
+	<td>/run/com.vaadin.tests.components.combobox.ComboBoxValueInput</td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxValueInput::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[1]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']/div/div[2]/table/tbody/tr[3]/td</td>
+	<td>58,6</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxValueInput::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[0]</td>
+	<td>96,14</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxValueInput::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VFilterSelect[0]/domChild[1]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']/div/div[2]/table/tbody/tr[4]/td/span</td>
+	<td>29,6</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxValueInput::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VFilterSelect[0]/domChild[1]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']/div/div[2]/table/tbody/tr[3]/td</td>
+	<td>99,13</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxValueInput::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VFilterSelect[0]/domChild[1]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']/div/div[2]/table/tbody/tr[1]/td</td>
+	<td>97,14</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxValueInput::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VFilterSelect[0]/domChild[0]</td>
+	<td>68,17</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxValueInput::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VFilterSelect[0]/domChild[0]</td>
+	<td>value</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxValueInput::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VFilterSelect[0]/domChild[0]</td>
+	<td>down</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxValueInput::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VFilterSelect[0]/domChild[0]</td>
+	<td>down</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxValueInput::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VFilterSelect[0]/domChild[0]</td>
+	<td>down</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>pressSpecialKey</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxValueInput::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VFilterSelect[0]/domChild[0]</td>
+	<td>enter</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxValueInput::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VFilterSelect[0]/domChild[0]</td>
+	<td>76,17</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxValueInput::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VFilterSelect[0]/domChild[1]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']/div/div[2]/table/tbody/tr[2]/td</td>
+	<td>71,11</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxValueInput::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VFilterSelect[0]/domChild[1]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>//div[@id='VAADIN_COMBOBOX_OPTIONLIST']/div/div[2]/table/tbody/tr[1]/td</td>
+	<td>58,9</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxValueInput::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VFilterSelect[0]/domChild[0]</td>
+	<td>73,12</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentscomboboxComboBoxValueInput::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[5]/VFilterSelect[0]/domChild[0]</td>
+	<td>43,7</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
diff --git a/src/com/vaadin/tests/components/combobox/ComboBoxValueInput.java b/src/com/vaadin/tests/components/combobox/ComboBoxValueInput.java
index 21e2759ddf..c91a707859 100644
--- a/src/com/vaadin/tests/components/combobox/ComboBoxValueInput.java
+++ b/src/com/vaadin/tests/components/combobox/ComboBoxValueInput.java
@@ -31,6 +31,10 @@ public class ComboBoxValueInput extends TestBase {
         cb = getComboBox("A read-only combobox", true);
         cb.setReadOnly(true);
         addComponent(cb);
+
+        cb = getComboBox("A combobox with filteringMode off", false);
+        cb.setFilteringMode(ComboBox.FILTERINGMODE_OFF);
+
     }
 
     @Override
diff --git a/src/com/vaadin/tests/components/datefield/DateFieldReadOnly.html b/src/com/vaadin/tests/components/datefield/DateFieldReadOnly.html
index efc9983ab5..af711b9ab8 100644
--- a/src/com/vaadin/tests/components/datefield/DateFieldReadOnly.html
+++ b/src/com/vaadin/tests/components/datefield/DateFieldReadOnly.html
@@ -37,7 +37,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>click</td>
+	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldReadOnly::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VPopupCalendar[0]/domChild[1]</td>
 	<td></td>
 </tr>
@@ -57,9 +57,9 @@
 	<td></td>
 </tr>
 <tr>
-	<td>clickAt</td>
+	<td>mouseClick</td>
 	<td>vaadin=runcomvaadintestscomponentsdatefieldDateFieldReadOnly::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
-	<td>0,0</td>
+	<td></td>
 </tr>
 <tr>
 	<td>waitForVaadin</td>
diff --git a/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html b/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html
index 33509916f7..61aa100a36 100644
--- a/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html
+++ b/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html
@@ -21,10 +21,11 @@
 	<td></td>
 	<td></td>
 </tr>
+<!--Initial state, all 3 columns visible-->
 <tr>
 	<td>screenCapture</td>
 	<td></td>
-	<td></td>
+	<td>col1-col2-col3-visible</td>
 </tr>
 <tr>
 	<td>click</td>
@@ -36,6 +37,7 @@
 	<td></td>
 	<td></td>
 </tr>
+<!--Hide 'col2' through table interface-->
 <tr>
 	<td>click</td>
 	<td>//td[@id='gwt-uid-2']/span/div</td>
@@ -49,7 +51,141 @@
 <tr>
 	<td>screenCapture</td>
 	<td></td>
+	<td>col2-hidden</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableColumnCollapsingAndColumnExpansion::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VTextField[0]</td>
+	<td>79,15</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentstableColumnCollapsingAndColumnExpansion::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VTextField[0]</td>
+	<td>Col1</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableColumnCollapsingAndColumnExpansion::/VVerticalLayout[0]/domChild[0]/domChild[1]</td>
+	<td>221,457</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<!--Hide 'Col1' using button-->
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentstableColumnCollapsingAndColumnExpansion::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>col1-col2-hidden</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableColumnCollapsingAndColumnExpansion::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VTextField[0]</td>
+	<td>55,14</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentstableColumnCollapsingAndColumnExpansion::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VTextField[0]</td>
+	<td>Col2</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<!--Show 'col2' using button-->
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentstableColumnCollapsingAndColumnExpansion::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableColumnCollapsingAndColumnExpansion::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VTextField[0]</td>
+	<td>70,16</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>col1-hidden</td>
+</tr>
+<tr>
+	<td>mouseClick</td>
+	<td>vaadin=runcomvaadintestscomponentstableColumnCollapsingAndColumnExpansion::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VTextField[0]</td>
+	<td>45,19</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>enterCharacter</td>
+	<td>vaadin=runcomvaadintestscomponentstableColumnCollapsingAndColumnExpansion::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VTextField[0]</td>
+	<td>Col1</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<!--Show 'Col1' using button-->
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentstableColumnCollapsingAndColumnExpansion::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<!--We should now be back at the initial state, all 3 columns visible-->
+<tr>
+	<td>screenCapture</td>
 	<td></td>
+	<td>col1-col2-col3-visible-again</td>
 </tr>
 
 </tbody></table>
diff --git a/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java b/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java
index f3f04a1169..16a9d41b75 100644
--- a/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java
+++ b/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.java
@@ -1,29 +1,73 @@
 package com.vaadin.tests.components.table;
 
 import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Alignment;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Table;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class ColumnCollapsingAndColumnExpansion extends TestBase {
 
+    private Table table;
+
     @Override
     public void setup() {
 
-        Table t = new Table();
+        table = new Table();
 
-        t.addContainerProperty("Col1", String.class, null);
-        t.addContainerProperty("Col2", String.class, null);
-        t.addContainerProperty("Col3", String.class, null);
-        t.setColumnCollapsingAllowed(true);
+        table.addContainerProperty("Col1", String.class, null);
+        table.addContainerProperty("Col2", String.class, null);
+        table.addContainerProperty("Col3", String.class, null);
+        table.setColumnCollapsingAllowed(true);
 
-        t.setSizeFull();
+        table.setSizeFull();
 
         for (int y = 1; y < 5; y++) {
-            t.addItem(new Object[] { "cell " + 1 + "-" + y,
+            table.addItem(new Object[] { "cell " + 1 + "-" + y,
                     "cell " + 2 + "-" + y, "cell " + 3 + "-" + y, },
                     new Object());
         }
 
-        addComponent(t);
+        addComponent(table);
+
+        HorizontalLayout hl = new HorizontalLayout();
+        final TextField tf = new TextField("Column name");
+        Button hide = new Button("Collapse", new ClickListener() {
+
+            public void buttonClick(ClickEvent event) {
+                try {
+                    table.setColumnCollapsed(tf.getValue(), true);
+                } catch (IllegalAccessException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+            }
+
+        });
+
+        Button show = new Button("Show", new ClickListener() {
+
+            public void buttonClick(ClickEvent event) {
+                try {
+                    table.setColumnCollapsed(tf.getValue(), false);
+                } catch (IllegalAccessException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+            }
+
+        });
+
+        hl.addComponent(tf);
+        hl.addComponent(hide);
+        hl.addComponent(show);
+        hl.setComponentAlignment(tf, Alignment.BOTTOM_LEFT);
+        hl.setComponentAlignment(hide, Alignment.BOTTOM_LEFT);
+        hl.setComponentAlignment(show, Alignment.BOTTOM_LEFT);
+        addComponent(hl);
 
     }
 
diff --git a/src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html b/src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html
index 08b7869587..c476374a70 100644
--- a/src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html
+++ b/src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html
@@ -3,7 +3,7 @@
 <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="" />
+<link rel="selenium.base" href="http://localhost:8888/" />
 <title>TabsheetTooltip</title>
 </head>
 <body>
@@ -22,8 +22,8 @@
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
-	<td>Tab<br /> <br /><br /><br /><br />Tab 2<br /><br /><br /><br /><br /><br />Label</td>
+	<td>screenCapture</td>
+	<td></td>
 	<td></td>
 </tr>
 <tr>
@@ -37,13 +37,13 @@
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
-	<td>Tab<br /> <br /><br /><br /><br />Tab 2<br /><br /><br /><br /><br /><br />Label<br /><br />Another label, d'oh</td>
+	<td>mouseOver</td>
+	<td>vaadin=runcomvaadintestscomponentstabsheetTabsheetTooltip::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
 <tr>
-	<td>mouseOver</td>
-	<td>vaadin=runcomvaadintestscomponentstabsheetTabsheetTooltip::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+	<td>pause</td>
+	<td>1000</td>
 	<td></td>
 </tr>
 <tr>
@@ -57,7 +57,7 @@
 	<td></td>
 </tr>
 <tr>
-	<td>click</td>
+	<td>mouseOver</td>
 	<td>vaadin=runcomvaadintestscomponentstabsheetTabsheetTooltip::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]</td>
 	<td></td>
 </tr>
@@ -67,8 +67,8 @@
 	<td></td>
 </tr>
 <tr>
-	<td>mouseOver</td>
-	<td>vaadin=runcomvaadintestscomponentstabsheetTabsheetTooltip::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]</td>
+	<td>pause</td>
+	<td>1000</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/src/com/vaadin/tests/components/window/UndefinedWidthSubWindow.html b/src/com/vaadin/tests/components/window/UndefinedWidthSubWindow.html
index 51aabc7e8f..68bb3c5f2d 100644
--- a/src/com/vaadin/tests/components/window/UndefinedWidthSubWindow.html
+++ b/src/com/vaadin/tests/components/window/UndefinedWidthSubWindow.html
@@ -3,7 +3,7 @@
 <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="" />
+<link rel="selenium.base" href="http://localhost:8888/" />
 <title>UndefinedWidthSubWindow</title>
 </head>
 <body>
@@ -24,7 +24,62 @@
 <tr>
 	<td>screenCapture</td>
 	<td></td>
+	<td>add-button</td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentswindowUndefinedWidthSubWindow::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentswindowUndefinedWidthSubWindow::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
+	<td></td>
+	<td>add+2 remove</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentswindowUndefinedWidthSubWindow::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>vaadin=runcomvaadintestscomponentswindowUndefinedWidthSubWindow::/VWindow[0]/ScrollPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
+	<td></td>
+</tr>
+<tr>
+	<td>waitForVaadin</td>
+	<td></td>
+	<td></td>
+</tr>
+<tr>
+	<td>screenCapture</td>
 	<td></td>
+	<td>add-button only</td>
 </tr>
 
 </tbody></table>
diff --git a/src/com/vaadin/tests/components/window/UndefinedWidthSubWindow.java b/src/com/vaadin/tests/components/window/UndefinedWidthSubWindow.java
index f29178a525..c8009c8431 100644
--- a/src/com/vaadin/tests/components/window/UndefinedWidthSubWindow.java
+++ b/src/com/vaadin/tests/components/window/UndefinedWidthSubWindow.java
@@ -2,12 +2,18 @@ package com.vaadin.tests.components.window;
 
 import com.vaadin.tests.components.TestBase;
 import com.vaadin.ui.Button;
+import com.vaadin.ui.Component;
+import com.vaadin.ui.ComponentContainer;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
 
 public class UndefinedWidthSubWindow extends TestBase {
 
+    private Window autoWideWindow;
+
     @Override
     protected String getDescription() {
         return "Two windows should be shown. The width of the one in the upper left corner should be adjusted according to the contents. The centered windows width should be set according to the caption and the second textfield should be clipped.";
@@ -18,16 +24,37 @@ public class UndefinedWidthSubWindow extends TestBase {
         return null;
     }
 
+    private Component createRemoveButton() {
+        Button b = new Button("Remove");
+        b.addListener(new ClickListener() {
+
+            public void buttonClick(ClickEvent event) {
+                Button b = event.getButton();
+                ComponentContainer cc = (ComponentContainer) b.getParent();
+                cc.removeComponent(b);
+            }
+        });
+
+        return b;
+    }
+
     @Override
     protected void setup() {
-        Window dialog = new Window("Dialog - width defined by contents",
+        autoWideWindow = new Window("Dialog - width defined by contents",
                 new HorizontalLayout());
-        dialog.getContent().setSizeUndefined();
-        dialog.addComponent(new TextField("Field 1"));
-        dialog.addComponent(new TextField("Field 2"));
-        dialog.addComponent(new Button("Ok"));
+        autoWideWindow.getContent().setSizeUndefined();
+        autoWideWindow.addComponent(new TextField("Field 1"));
+        autoWideWindow.addComponent(new TextField("Field 2"));
+        autoWideWindow.addComponent(new Button("Add", new ClickListener() {
 
-        getMainWindow().addWindow(dialog);
+            public void buttonClick(ClickEvent event) {
+                autoWideWindow.addComponent(createRemoveButton());
+
+            }
+
+        }));
+
+        getMainWindow().addWindow(autoWideWindow);
 
         Window dialog2 = new Window("Dialog - width defined by caption");
         dialog2.addComponent(new TextField("Field 1"));
@@ -40,5 +67,4 @@ public class UndefinedWidthSubWindow extends TestBase {
         dialog2.center();
         getMainWindow().addWindow(dialog2);
     }
-
 }
author	Artur Signell <artur.signell@itmill.com>	2009-10-19 11:09:44 +0000
committer	Artur Signell <artur.signell@itmill.com>	2009-10-19 11:09:44 +0000
commit	b26bec94b51103a0030658691f2669bfe9c44b1c (patch)
tree	d539e36f51897f7f3043d897bfc0da1ad8ceab34 /src
parent	95dad56e345c7f7f0c96e9380f5345dfac89e5d0 (diff)
download	vaadin-framework-b26bec94b51103a0030658691f2669bfe9c44b1c.tar.gz vaadin-framework-b26bec94b51103a0030658691f2669bfe9c44b1c.zip