summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikael Grankvist <mikael.grankvist@itmill.com>2009-09-14 13:57:56 +0000
committerMikael Grankvist <mikael.grankvist@itmill.com>2009-09-14 13:57:56 +0000
commit10fbfac43675764c96ece75e4f48a53c2ef962b7 (patch)
treee3825240e8e46cb48f79740eb33d44f8e7482e60
parent058cfed6405eba82dba8f20a3c5a4faeb2e30b45 (diff)
downloadvaadin-framework-10fbfac43675764c96ece75e4f48a53c2ef962b7.tar.gz
vaadin-framework-10fbfac43675764c96ece75e4f48a53c2ef962b7.zip
Update faulty identifiers in .html test cases.
svn changeset:8763/svn branch:6.1
-rw-r--r--src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.html2
-rw-r--r--src/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.html10
-rw-r--r--src/com/vaadin/tests/components/accordion/RemoveTabs.html14
-rw-r--r--src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html2
-rw-r--r--src/com/vaadin/tests/components/button/ButtonUndefinedWidth.html10
-rw-r--r--src/com/vaadin/tests/components/button/DisabledButtons.html2
-rw-r--r--src/com/vaadin/tests/components/button/IE7ButtonWithIcon.html2
-rw-r--r--src/com/vaadin/tests/components/button/TooltipForDisabledButton.html10
-rw-r--r--src/com/vaadin/tests/components/caption/LargeCaptionIcon.html2
-rw-r--r--src/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.html2
-rw-r--r--src/com/vaadin/tests/components/checkbox/CheckboxIcon.html6
-rw-r--r--src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.html4
-rw-r--r--src/com/vaadin/tests/components/combobox/ComboBoxNavigation.html10
-rw-r--r--src/com/vaadin/tests/components/embedded/EmbeddedTooltip.html4
-rw-r--r--src/com/vaadin/tests/components/form/FormCommitWithInvalidValues.html16
-rw-r--r--src/com/vaadin/tests/components/form/FormRenderingFlicker.html4
-rw-r--r--src/com/vaadin/tests/components/label/HundredPercentWideLabelResize.html6
-rw-r--r--src/com/vaadin/tests/components/label/LabelWrapping.html6
-rw-r--r--src/com/vaadin/tests/components/link/LinkTargetSize.html4
-rw-r--r--src/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.html4
-rw-r--r--src/com/vaadin/tests/components/popupview/PopupViewOffScreen.html4
-rw-r--r--src/com/vaadin/tests/components/richtextarea/RichTextAreaSize.html2
-rw-r--r--src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.html4
-rw-r--r--src/com/vaadin/tests/components/table/ClippedComponentsInTable.html2
-rw-r--r--src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html4
-rw-r--r--src/com/vaadin/tests/components/table/ColumnExpandRatio.html2
-rw-r--r--src/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.html2
-rw-r--r--src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.html6
-rw-r--r--src/com/vaadin/tests/components/table/MissingScrollbar.html6
-rw-r--r--src/com/vaadin/tests/components/table/PropertyValueChange.html10
-rw-r--r--src/com/vaadin/tests/components/table/RowAdditionTest.html24
-rw-r--r--src/com/vaadin/tests/components/table/TableLastRowMissing.html2
-rw-r--r--src/com/vaadin/tests/components/table/TablePageLengthUpdate.html18
-rw-r--r--src/com/vaadin/tests/components/table/TableRowHeight.html2
-rw-r--r--src/com/vaadin/tests/components/table/TableRowHeight2.html6
-rw-r--r--src/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.html8
-rw-r--r--src/com/vaadin/tests/components/table/TextFieldRelativeWidth.html6
-rw-r--r--src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html16
-rw-r--r--src/com/vaadin/tests/components/tabsheet/PreventTabChange.html10
-rw-r--r--src/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html14
-rw-r--r--src/com/vaadin/tests/components/tabsheet/TabSheetDisabling.html24
-rw-r--r--src/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.html2
-rw-r--r--src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html10
-rw-r--r--src/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.html8
-rw-r--r--src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html2
-rw-r--r--src/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.html2
-rw-r--r--src/com/vaadin/tests/components/window/EmbeddedInSubWindow.html2
-rw-r--r--src/com/vaadin/tests/components/window/SubwindowInvalidLayout.html2
-rw-r--r--src/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.html2
-rw-r--r--src/com/vaadin/tests/components/window/UndefinedWidthSubWindow.html2
-rw-r--r--src/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.html14
-rw-r--r--tests/test.xml5
52 files changed, 173 insertions, 170 deletions
diff --git a/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.html b/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.html
index f39f409e8c..ff5c890abf 100644
--- a/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.html
+++ b/src/com/vaadin/tests/components/absolutelayout/AbsoluteLayoutClipping.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.absolutelayout.AbsoluteLayoutClipping</td>
+ <td>/run/com.vaadin.tests.components.absolutelayout.AbsoluteLayoutClipping</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.html b/src/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.html
index cfc855cf99..ef2c784e15 100644
--- a/src/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.html
+++ b/src/com/vaadin/tests/components/abstractfield/AbstractFieldCommitWithInvalidValues.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.abstractfield.AbstractFieldCommitWithInvalidValues</td>
+ <td>/run/com.vaadin.tests.components.abstractfield.AbstractFieldCommitWithInvalidValues</td>
<td></td>
</tr>
<tr>
@@ -23,7 +23,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentsabstractfieldAbstractFieldCommitWithInvalidValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentsabstractfieldAbstractFieldCommitWithInvalidValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -38,7 +38,7 @@
</tr>
<tr>
<td>clickAt</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentsabstractfieldAbstractFieldCommitWithInvalidValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTextField[0]</td>
+ <td>vaadin=runcomvaadintestscomponentsabstractfieldAbstractFieldCommitWithInvalidValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTextField[0]</td>
<td></td>
</tr>
<tr>
@@ -48,12 +48,12 @@
</tr>
<tr>
<td>type</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentsabstractfieldAbstractFieldCommitWithInvalidValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTextField[0]</td>
+ <td>vaadin=runcomvaadintestscomponentsabstractfieldAbstractFieldCommitWithInvalidValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTextField[0]</td>
<td>long</td>
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentsabstractfieldAbstractFieldCommitWithInvalidValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentsabstractfieldAbstractFieldCommitWithInvalidValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/accordion/RemoveTabs.html b/src/com/vaadin/tests/components/accordion/RemoveTabs.html
index dd9fe952e6..ec24ade8ce 100644
--- a/src/com/vaadin/tests/components/accordion/RemoveTabs.html
+++ b/src/com/vaadin/tests/components/accordion/RemoveTabs.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.accordion.RemoveTabs</td>
+ <td>/run/com.vaadin.tests.components.accordion.RemoveTabs</td>
<td></td>
</tr>
<tr>
@@ -28,7 +28,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentsaccordionRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentsaccordionRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -43,7 +43,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentsaccordionRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VAccordion[0]/domChild[2]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentsaccordionRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VAccordion[0]/domChild[2]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -58,7 +58,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentsaccordionRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentsaccordionRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -73,7 +73,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentsaccordionRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentsaccordionRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -88,7 +88,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentsaccordionRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentsaccordionRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -103,7 +103,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentsaccordionRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentsaccordionRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html b/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html
index 7b2b61bc79..ea49b92c6a 100644
--- a/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html
+++ b/src/com/vaadin/tests/components/beanitemcontainer/TestBeanItemContainerUsage.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.beanitemcontainer.TestBeanItemContainerUsage</td>
+ <td>/run/com.vaadin.tests.components.beanitemcontainer.TestBeanItemContainerUsage</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/button/ButtonUndefinedWidth.html b/src/com/vaadin/tests/components/button/ButtonUndefinedWidth.html
index f5c90750d1..7c9b3a6559 100644
--- a/src/com/vaadin/tests/components/button/ButtonUndefinedWidth.html
+++ b/src/com/vaadin/tests/components/button/ButtonUndefinedWidth.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.button.ButtonUndefinedWidth</td>
+ <td>/run/com.vaadin.tests.components.button.ButtonUndefinedWidth</td>
<td></td>
</tr>
<tr>
@@ -33,7 +33,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentsbuttonButtonUndefinedWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentsbuttonButtonUndefinedWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -43,7 +43,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentsbuttonButtonUndefinedWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td>
+ <td>vaadin=runcomvaadintestscomponentsbuttonButtonUndefinedWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VNativeButton[0]</td>
<td></td>
</tr>
<tr>
@@ -53,7 +53,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentsbuttonButtonUndefinedWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/ScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentsbuttonButtonUndefinedWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/ScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -63,7 +63,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentsbuttonButtonUndefinedWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/ScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VNativeButton[0]</td>
+ <td>vaadin=runcomvaadintestscomponentsbuttonButtonUndefinedWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VScrollTable[0]/ScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VNativeButton[0]</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/button/DisabledButtons.html b/src/com/vaadin/tests/components/button/DisabledButtons.html
index 1a73bdee5c..65584fd4d0 100644
--- a/src/com/vaadin/tests/components/button/DisabledButtons.html
+++ b/src/com/vaadin/tests/components/button/DisabledButtons.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.button.DisabledButtons</td>
+ <td>/run/com.vaadin.tests.components.button.DisabledButtons</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/button/IE7ButtonWithIcon.html b/src/com/vaadin/tests/components/button/IE7ButtonWithIcon.html
index 8eb2df869c..a05b439759 100644
--- a/src/com/vaadin/tests/components/button/IE7ButtonWithIcon.html
+++ b/src/com/vaadin/tests/components/button/IE7ButtonWithIcon.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.button.IE7ButtonWithIcon</td>
+ <td>/run/com.vaadin.tests.components.button.IE7ButtonWithIcon</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/button/TooltipForDisabledButton.html b/src/com/vaadin/tests/components/button/TooltipForDisabledButton.html
index 809b07e736..f5dc4dfebe 100644
--- a/src/com/vaadin/tests/components/button/TooltipForDisabledButton.html
+++ b/src/com/vaadin/tests/components/button/TooltipForDisabledButton.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.button.TooltipForDisabledButton</td>
+ <td>/run/com.vaadin.tests.components.button.TooltipForDisabledButton</td>
<td></td>
</tr>
<tr>
@@ -23,7 +23,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentsbuttonTooltipForDisabledButton::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentsbuttonTooltipForDisabledButton::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -33,7 +33,7 @@
</tr>
<tr>
<td>mouseOver</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentsbuttonTooltipForDisabledButton::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentsbuttonTooltipForDisabledButton::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -58,7 +58,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentsbuttonTooltipForDisabledButton::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentsbuttonTooltipForDisabledButton::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -68,7 +68,7 @@
</tr>
<tr>
<td>mouseOver</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentsbuttonTooltipForDisabledButton::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentsbuttonTooltipForDisabledButton::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/caption/LargeCaptionIcon.html b/src/com/vaadin/tests/components/caption/LargeCaptionIcon.html
index fd0a3c4394..61a014c975 100644
--- a/src/com/vaadin/tests/components/caption/LargeCaptionIcon.html
+++ b/src/com/vaadin/tests/components/caption/LargeCaptionIcon.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.caption.LargeCaptionIcon</td>
+ <td>/run/com.vaadin.tests.components.caption.LargeCaptionIcon</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.html b/src/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.html
index 8df99e7fa8..26ecc95721 100644
--- a/src/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.html
+++ b/src/com/vaadin/tests/components/checkbox/CheckboxCaptionWrapping.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.checkbox.CheckboxCaptionWrapping</td>
+ <td>/run/com.vaadin.tests.components.checkbox.CheckboxCaptionWrapping</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/checkbox/CheckboxIcon.html b/src/com/vaadin/tests/components/checkbox/CheckboxIcon.html
index 0af95f53e5..1404a052f0 100644
--- a/src/com/vaadin/tests/components/checkbox/CheckboxIcon.html
+++ b/src/com/vaadin/tests/components/checkbox/CheckboxIcon.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.checkbox.CheckboxIcon</td>
+ <td>/run/com.vaadin.tests.components.checkbox.CheckboxIcon</td>
<td></td>
</tr>
<tr>
@@ -33,7 +33,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentscheckboxCheckboxIcon::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VCheckBox[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentscheckboxCheckboxIcon::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VCheckBox[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -43,7 +43,7 @@
</tr>
<tr>
<td>mouseOver</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentscheckboxCheckboxIcon::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VCheckBox[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentscheckboxCheckboxIcon::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VCheckBox[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.html b/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.html
index 2e50f8361c..447000d6d7 100644
--- a/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.html
+++ b/src/com/vaadin/tests/components/combobox/ComboBoxItemIcon.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.combobox.ComboBoxItemIcon</td>
+ <td>/run/com.vaadin.tests.components.combobox.ComboBoxItemIcon</td>
<td></td>
</tr>
<tr>
@@ -23,7 +23,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentscomboboxComboBoxItemIcon::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[1]</td>
+ <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxItemIcon::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[1]</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/combobox/ComboBoxNavigation.html b/src/com/vaadin/tests/components/combobox/ComboBoxNavigation.html
index a3d1ccdf03..38f82be079 100644
--- a/src/com/vaadin/tests/components/combobox/ComboBoxNavigation.html
+++ b/src/com/vaadin/tests/components/combobox/ComboBoxNavigation.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.combobox.ComboBoxNavigation</td>
+ <td>/run/com.vaadin.tests.components.combobox.ComboBoxNavigation</td>
<td></td>
</tr>
<tr>
@@ -23,7 +23,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -33,7 +33,7 @@
</tr>
<tr>
<td>keyPress</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
<td>\25</td>
</tr>
<tr>
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>keyPress</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
<td>\25</td>
</tr>
<tr>
@@ -63,7 +63,7 @@
</tr>
<tr>
<td>keyPress</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxNavigation::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
<td>\24</td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/embedded/EmbeddedTooltip.html b/src/com/vaadin/tests/components/embedded/EmbeddedTooltip.html
index 8028ffa66b..43e9863fb9 100644
--- a/src/com/vaadin/tests/components/embedded/EmbeddedTooltip.html
+++ b/src/com/vaadin/tests/components/embedded/EmbeddedTooltip.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.embedded.EmbeddedTooltip</td>
+ <td>/run/com.vaadin.tests.components.embedded.EmbeddedTooltip</td>
<td></td>
</tr>
<tr>
@@ -28,7 +28,7 @@
</tr>
<tr>
<td>mouseOver</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentsembeddedEmbeddedTooltip::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VEmbedded[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentsembeddedEmbeddedTooltip::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VEmbedded[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/form/FormCommitWithInvalidValues.html b/src/com/vaadin/tests/components/form/FormCommitWithInvalidValues.html
index ada010ef8d..b0305e60dc 100644
--- a/src/com/vaadin/tests/components/form/FormCommitWithInvalidValues.html
+++ b/src/com/vaadin/tests/components/form/FormCommitWithInvalidValues.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.form.FormCommitWithInvalidValues</td>
+ <td>/run/com.vaadin.tests.components.form.FormCommitWithInvalidValues</td>
<td></td>
</tr>
<tr>
@@ -23,7 +23,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentsformFormCommitWithInvalidValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentsformFormCommitWithInvalidValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -38,7 +38,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentsformFormCommitWithInvalidValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
+ <td>vaadin=runcomvaadintestscomponentsformFormCommitWithInvalidValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
<td></td>
</tr>
<tr>
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>type</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentsformFormCommitWithInvalidValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
+ <td>vaadin=runcomvaadintestscomponentsformFormCommitWithInvalidValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
<td>1</td>
</tr>
<tr>
@@ -58,7 +58,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentsformFormCommitWithInvalidValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentsformFormCommitWithInvalidValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -73,7 +73,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentsformFormCommitWithInvalidValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
+ <td>vaadin=runcomvaadintestscomponentsformFormCommitWithInvalidValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
<td></td>
</tr>
<tr>
@@ -83,7 +83,7 @@
</tr>
<tr>
<td>type</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentsformFormCommitWithInvalidValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
+ <td>vaadin=runcomvaadintestscomponentsformFormCommitWithInvalidValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VForm[0]/VFormLayout[0]/VFormLayout$VFormLayoutTable[0]/VTextField[0]</td>
<td>123</td>
</tr>
<tr>
@@ -93,7 +93,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentsformFormCommitWithInvalidValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentsformFormCommitWithInvalidValues::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/form/FormRenderingFlicker.html b/src/com/vaadin/tests/components/form/FormRenderingFlicker.html
index 9da5e4a08e..a99556d6d6 100644
--- a/src/com/vaadin/tests/components/form/FormRenderingFlicker.html
+++ b/src/com/vaadin/tests/components/form/FormRenderingFlicker.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.form.FormRenderingFlicker</td>
+ <td>/run/com.vaadin.tests.components.form.FormRenderingFlicker</td>
<td></td>
</tr>
<tr>
@@ -28,7 +28,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentsformFormRenderingFlicker::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentsformFormRenderingFlicker::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VPanel[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/label/HundredPercentWideLabelResize.html b/src/com/vaadin/tests/components/label/HundredPercentWideLabelResize.html
index 4608c60c11..667f08ba4f 100644
--- a/src/com/vaadin/tests/components/label/HundredPercentWideLabelResize.html
+++ b/src/com/vaadin/tests/components/label/HundredPercentWideLabelResize.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.label.HundredPercentWideLabelResize</td>
+ <td>/run/com.vaadin.tests.components.label.HundredPercentWideLabelResize</td>
<td></td>
</tr>
<tr>
@@ -28,7 +28,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentslabelHundredPercentWideLabelResize::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentslabelHundredPercentWideLabelResize::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -43,7 +43,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentslabelHundredPercentWideLabelResize::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentslabelHundredPercentWideLabelResize::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/label/LabelWrapping.html b/src/com/vaadin/tests/components/label/LabelWrapping.html
index 91d5ba91a7..b8038a75b4 100644
--- a/src/com/vaadin/tests/components/label/LabelWrapping.html
+++ b/src/com/vaadin/tests/components/label/LabelWrapping.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.label.LabelWrapping</td>
+ <td>/run/com.vaadin.tests.components.label.LabelWrapping</td>
<td></td>
</tr>
<tr>
@@ -28,7 +28,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentslabelLabelWrapping::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentslabelLabelWrapping::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -43,7 +43,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentslabelLabelWrapping::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentslabelLabelWrapping::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/link/LinkTargetSize.html b/src/com/vaadin/tests/components/link/LinkTargetSize.html
index f839f0835a..a28865361f 100644
--- a/src/com/vaadin/tests/components/link/LinkTargetSize.html
+++ b/src/com/vaadin/tests/components/link/LinkTargetSize.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.link.LinkTargetSize</td>
+ <td>/run/com.vaadin.tests.components.link.LinkTargetSize</td>
<td></td>
</tr>
<tr>
@@ -23,7 +23,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentslinkLinkTargetSize::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VLink[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentslinkLinkTargetSize::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VLink[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.html b/src/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.html
index 02f81d4b94..7a071030dc 100644
--- a/src/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.html
+++ b/src/com/vaadin/tests/components/orderedlayout/ReplaceComponentNPE.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.orderedlayout.ReplaceComponentNPE</td>
+ <td>/run/com.vaadin.tests.components.orderedlayout.ReplaceComponentNPE</td>
<td></td>
</tr>
<tr>
@@ -28,7 +28,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentsorderedlayoutReplaceComponentNPE::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentsorderedlayoutReplaceComponentNPE::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/popupview/PopupViewOffScreen.html b/src/com/vaadin/tests/components/popupview/PopupViewOffScreen.html
index c349666aba..99ee864179 100644
--- a/src/com/vaadin/tests/components/popupview/PopupViewOffScreen.html
+++ b/src/com/vaadin/tests/components/popupview/PopupViewOffScreen.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.popupview.PopupViewOffScreen</td>
+ <td>/run/com.vaadin.tests.components.popupview.PopupViewOffScreen</td>
<td></td>
</tr>
<tr>
@@ -28,7 +28,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentspopupviewPopupViewOffScreen::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentspopupviewPopupViewOffScreen::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VGridLayout[0]/AbsolutePanel[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/richtextarea/RichTextAreaSize.html b/src/com/vaadin/tests/components/richtextarea/RichTextAreaSize.html
index aaac22bc81..7708c88e54 100644
--- a/src/com/vaadin/tests/components/richtextarea/RichTextAreaSize.html
+++ b/src/com/vaadin/tests/components/richtextarea/RichTextAreaSize.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.richtextarea.RichTextAreaSize</td>
+ <td>/run/com.vaadin.tests.components.richtextarea.RichTextAreaSize</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.html b/src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.html
index a7273c1538..876ed75ea8 100644
--- a/src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.html
+++ b/src/com/vaadin/tests/components/splitpanel/SplitPanelSplitterWidth.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.splitpanel.SplitPanelSplitterWidth</td>
+ <td>/run/com.vaadin.tests.components.splitpanel.SplitPanelSplitterWidth</td>
<td></td>
</tr>
<tr>
@@ -28,7 +28,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentssplitpanelSplitPanelSplitterWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentssplitpanelSplitPanelSplitterWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/table/ClippedComponentsInTable.html b/src/com/vaadin/tests/components/table/ClippedComponentsInTable.html
index f69650a528..4a6ccbbe2d 100644
--- a/src/com/vaadin/tests/components/table/ClippedComponentsInTable.html
+++ b/src/com/vaadin/tests/components/table/ClippedComponentsInTable.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.table.ClippedComponentsInTable</td>
+ <td>/run/com.vaadin.tests.components.table.ClippedComponentsInTable</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html b/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html
index 1a6d092005..33509916f7 100644
--- a/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html
+++ b/src/com/vaadin/tests/components/table/ColumnCollapsingAndColumnExpansion.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.table.ColumnCollapsingAndColumnExpansion</td>
+ <td>/run/com.vaadin.tests.components.table.ColumnCollapsingAndColumnExpansion</td>
<td></td>
</tr>
<tr>
@@ -28,7 +28,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableColumnCollapsingAndColumnExpansion::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[0]/domChild[1]</td>
+ <td>vaadin=runcomvaadintestscomponentstableColumnCollapsingAndColumnExpansion::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[0]/domChild[1]</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/table/ColumnExpandRatio.html b/src/com/vaadin/tests/components/table/ColumnExpandRatio.html
index e741c12bec..6d5422831e 100644
--- a/src/com/vaadin/tests/components/table/ColumnExpandRatio.html
+++ b/src/com/vaadin/tests/components/table/ColumnExpandRatio.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.table.ColumnExpandRatio</td>
+ <td>/run/com.vaadin.tests.components.table.ColumnExpandRatio</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.html b/src/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.html
index 1b391030ec..eb338c8dde 100644
--- a/src/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.html
+++ b/src/com/vaadin/tests/components/table/ColumnExpandWithFixedColumns.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.table.ColumnExpandWithFixedColumns</td>
+ <td>/run/com.vaadin.tests.components.table.ColumnExpandWithFixedColumns</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.html b/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.html
index 6176e263e5..e8dccea4e7 100644
--- a/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.html
+++ b/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.table.LabelEmbeddedClickThroughForTable</td>
+ <td>/run/com.vaadin.tests.components.table.LabelEmbeddedClickThroughForTable</td>
<td></td>
</tr>
<tr>
@@ -23,7 +23,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/ScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VLabel[1]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/ScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VLabel[1]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -38,7 +38,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/ScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VLabel[1]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/ScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VLabel[1]/domChild[0]</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/table/MissingScrollbar.html b/src/com/vaadin/tests/components/table/MissingScrollbar.html
index cbbdd9e9fc..dfea329e60 100644
--- a/src/com/vaadin/tests/components/table/MissingScrollbar.html
+++ b/src/com/vaadin/tests/components/table/MissingScrollbar.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.table.MissingScrollbar</td>
+ <td>/run/com.vaadin.tests.components.table.MissingScrollbar</td>
<td></td>
</tr>
<tr>
@@ -23,7 +23,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableMissingScrollbar::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstableMissingScrollbar::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -38,7 +38,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableMissingScrollbar::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstableMissingScrollbar::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VVerticalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/table/PropertyValueChange.html b/src/com/vaadin/tests/components/table/PropertyValueChange.html
index 5e4ec51749..41f97ebb61 100644
--- a/src/com/vaadin/tests/components/table/PropertyValueChange.html
+++ b/src/com/vaadin/tests/components/table/PropertyValueChange.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.table.PropertyValueChange</td>
+ <td>/run/com.vaadin.tests.components.table.PropertyValueChange</td>
<td></td>
</tr>
<tr>
@@ -28,7 +28,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstablePropertyValueChange::PID_Seditortable/ScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VFilterSelect[0]/domChild[1]</td>
+ <td>vaadin=runcomvaadintestscomponentstablePropertyValueChange::PID_Seditortable/ScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VFilterSelect[0]/domChild[1]</td>
<td></td>
</tr>
<tr>
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstablePropertyValueChange::PID_Seditortable/ScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VTextField[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstablePropertyValueChange::PID_Seditortable/ScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VTextField[0]</td>
<td></td>
</tr>
<tr>
@@ -58,7 +58,7 @@
</tr>
<tr>
<td>type</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstablePropertyValueChange::PID_Seditortable/ScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VTextField[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstablePropertyValueChange::PID_Seditortable/ScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VTextField[0]</td>
<td>9</td>
</tr>
<tr>
@@ -68,7 +68,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstablePropertyValueChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstablePropertyValueChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/table/RowAdditionTest.html b/src/com/vaadin/tests/components/table/RowAdditionTest.html
index e731052aa2..4125e32e41 100644
--- a/src/com/vaadin/tests/components/table/RowAdditionTest.html
+++ b/src/com/vaadin/tests/components/table/RowAdditionTest.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.table.RowAdditionTest</td>
+ <td>/run/com.vaadin.tests.components.table.RowAdditionTest</td>
<td></td>
</tr>
<tr>
@@ -23,7 +23,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -38,7 +38,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>scroll</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]</td>
+ <td>vaadin=runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]</td>
<td>300</td>
</tr>
<tr>
@@ -58,7 +58,7 @@
</tr>
<tr>
<td>scroll</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]</td>
+ <td>vaadin=runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]</td>
<td>600</td>
</tr>
<tr>
@@ -68,7 +68,7 @@
</tr>
<tr>
<td>scroll</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]</td>
+ <td>vaadin=runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]</td>
<td>900</td>
</tr>
<tr>
@@ -83,7 +83,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VHorizontalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -93,7 +93,7 @@
</tr>
<tr>
<td>scroll</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]</td>
+ <td>vaadin=runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]</td>
<td>903</td>
</tr>
<tr>
@@ -103,7 +103,7 @@
</tr>
<tr>
<td>scroll</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]</td>
+ <td>vaadin=runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]</td>
<td>1203</td>
</tr>
<tr>
@@ -113,7 +113,7 @@
</tr>
<tr>
<td>scroll</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]</td>
+ <td>vaadin=runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]</td>
<td>1503</td>
</tr>
<tr>
@@ -123,7 +123,7 @@
</tr>
<tr>
<td>scroll</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]</td>
+ <td>vaadin=runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]</td>
<td>1803</td>
</tr>
<tr>
@@ -138,7 +138,7 @@
</tr>
<tr>
<td>scroll</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]</td>
+ <td>vaadin=runcomvaadintestscomponentstableRowAdditionTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]</td>
<td>1848</td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/table/TableLastRowMissing.html b/src/com/vaadin/tests/components/table/TableLastRowMissing.html
index aa4cca15d9..ca8ee6d6a4 100644
--- a/src/com/vaadin/tests/components/table/TableLastRowMissing.html
+++ b/src/com/vaadin/tests/components/table/TableLastRowMissing.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.table.TableLastRowMissing</td>
+ <td>/run/com.vaadin.tests.components.table.TableLastRowMissing</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/table/TablePageLengthUpdate.html b/src/com/vaadin/tests/components/table/TablePageLengthUpdate.html
index 6a45b43ac5..fe5887634f 100644
--- a/src/com/vaadin/tests/components/table/TablePageLengthUpdate.html
+++ b/src/com/vaadin/tests/components/table/TablePageLengthUpdate.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.table.TablePageLengthUpdate</td>
+ <td>/run/com.vaadin.tests.components.table.TablePageLengthUpdate</td>
<td></td>
</tr>
<tr>
@@ -23,7 +23,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableTablePageLengthUpdate::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTextField[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstableTablePageLengthUpdate::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTextField[0]</td>
<td></td>
</tr>
<tr>
@@ -33,12 +33,12 @@
</tr>
<tr>
<td>type</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableTablePageLengthUpdate::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTextField[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstableTablePageLengthUpdate::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTextField[0]</td>
<td>200px</td>
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableTablePageLengthUpdate::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstableTablePageLengthUpdate::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -58,7 +58,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableTablePageLengthUpdate::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTextField[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstableTablePageLengthUpdate::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTextField[0]</td>
<td></td>
</tr>
<tr>
@@ -68,12 +68,12 @@
</tr>
<tr>
<td>type</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableTablePageLengthUpdate::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTextField[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstableTablePageLengthUpdate::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTextField[0]</td>
<td>250px</td>
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableTablePageLengthUpdate::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstableTablePageLengthUpdate::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -98,12 +98,12 @@
</tr>
<tr>
<td>type</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableTablePageLengthUpdate::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTextField[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstableTablePageLengthUpdate::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VTextField[0]</td>
<td>50px</td>
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableTablePageLengthUpdate::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstableTablePageLengthUpdate::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/table/TableRowHeight.html b/src/com/vaadin/tests/components/table/TableRowHeight.html
index c61818c056..a28df6329f 100644
--- a/src/com/vaadin/tests/components/table/TableRowHeight.html
+++ b/src/com/vaadin/tests/components/table/TableRowHeight.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.table.TableRowHeight</td>
+ <td>/run/com.vaadin.tests.components.table.TableRowHeight</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/table/TableRowHeight2.html b/src/com/vaadin/tests/components/table/TableRowHeight2.html
index 68236fd534..bd83c1d9dc 100644
--- a/src/com/vaadin/tests/components/table/TableRowHeight2.html
+++ b/src/com/vaadin/tests/components/table/TableRowHeight2.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.table.TableRowHeight2</td>
+ <td>/run/com.vaadin.tests.components.table.TableRowHeight2</td>
<td></td>
</tr>
<tr>
@@ -28,7 +28,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableTableRowHeight2::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/ScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VButton[1]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstableTableRowHeight2::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/ScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VButton[1]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -38,7 +38,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableTableRowHeight2::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/ScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VButton[1]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstableTableRowHeight2::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/ScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VButton[1]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.html b/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.html
index 1e9316f174..05325cb9e6 100644
--- a/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.html
+++ b/src/com/vaadin/tests/components/table/TableVisibleColumnsUpdate.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.table.TableVisibleColumnsUpdate</td>
+ <td>/run/com.vaadin.tests.components.table.TableVisibleColumnsUpdate</td>
<td></td>
</tr>
<tr>
@@ -28,7 +28,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableTableVisibleColumnsUpdate::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstableTableVisibleColumnsUpdate::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -43,7 +43,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableTableVisibleColumnsUpdate::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstableTableVisibleColumnsUpdate::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -58,7 +58,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableTableVisibleColumnsUpdate::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstableTableVisibleColumnsUpdate::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.html b/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.html
index 9cc182e1d7..5b5ea40168 100644
--- a/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.html
+++ b/src/com/vaadin/tests/components/table/TextFieldRelativeWidth.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.table.TextFieldRelativeWidth</td>
+ <td>/run/com.vaadin.tests.components.table.TextFieldRelativeWidth</td>
<td></td>
</tr>
<tr>
@@ -28,7 +28,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableTextFieldRelativeWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/ScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[2]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstableTextFieldRelativeWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/ScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[2]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -38,7 +38,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstableTextFieldRelativeWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/ScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[4]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstableTextFieldRelativeWidth::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/ScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[4]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html b/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html
index 3f4e0e8f8f..dd07d8cef6 100644
--- a/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html
+++ b/src/com/vaadin/tests/components/tabsheet/AddAndRemoveTabs.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.tabsheet.AddAndRemoveTabs</td>
+ <td>/run/com.vaadin.tests.components.tabsheet.AddAndRemoveTabs</td>
<td></td>
</tr>
<tr>
@@ -23,7 +23,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetAddAndRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/VTabsheetPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstabsheetAddAndRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/VTabsheetPanel[0]/VHorizontalLayout[0]/ChildComponentContainer[0]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -38,7 +38,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetAddAndRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstabsheetAddAndRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetAddAndRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstabsheetAddAndRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -58,7 +58,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetAddAndRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstabsheetAddAndRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -73,7 +73,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetAddAndRemoveTabs::/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>vaadin=runcomvaadintestscomponentstabsheetAddAndRemoveTabs::/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>
<tr>
@@ -83,7 +83,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetAddAndRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/VTabsheetPanel[0]/VHorizontalLayout[1]/ChildComponentContainer[0]/VButton[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstabsheetAddAndRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/VTabsheetPanel[0]/VHorizontalLayout[1]/ChildComponentContainer[0]/VButton[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -98,7 +98,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetAddAndRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstabsheetAddAndRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/tabsheet/PreventTabChange.html b/src/com/vaadin/tests/components/tabsheet/PreventTabChange.html
index 40ab930a21..c4f5998f47 100644
--- a/src/com/vaadin/tests/components/tabsheet/PreventTabChange.html
+++ b/src/com/vaadin/tests/components/tabsheet/PreventTabChange.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.tabsheet.PreventTabChange</td>
+ <td>/run/com.vaadin.tests.components.tabsheet.PreventTabChange</td>
<td></td>
</tr>
<tr>
@@ -23,7 +23,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetPreventTabChange::/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>vaadin=runcomvaadintestscomponentstabsheetPreventTabChange::/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>
<tr>
@@ -33,7 +33,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetPreventTabChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstabsheetPreventTabChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetPreventTabChange::/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>vaadin=runcomvaadintestscomponentstabsheetPreventTabChange::/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>
@@ -58,7 +58,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetPreventTabChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstabsheetPreventTabChange::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html b/src/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html
index ef75f61ae4..07db540395 100644
--- a/src/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html
+++ b/src/com/vaadin/tests/components/tabsheet/RemoveTabsTabsheet.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.tabsheet.RemoveTabs</td>
+ <td>/run/com.vaadin.tests.components.tabsheet.RemoveTabs</td>
<td></td>
</tr>
<tr>
@@ -28,7 +28,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstabsheetRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -43,7 +43,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstabsheetRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]/domChild[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -53,7 +53,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstabsheetRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -68,7 +68,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstabsheetRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -83,7 +83,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstabsheetRemoveTabs::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -93,7 +93,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetRemoveTabs::/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>vaadin=runcomvaadintestscomponentstabsheetRemoveTabs::/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>
<tr>
diff --git a/src/com/vaadin/tests/components/tabsheet/TabSheetDisabling.html b/src/com/vaadin/tests/components/tabsheet/TabSheetDisabling.html
index b55e71eab4..bc03f7687b 100644
--- a/src/com/vaadin/tests/components/tabsheet/TabSheetDisabling.html
+++ b/src/com/vaadin/tests/components/tabsheet/TabSheetDisabling.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.tabsheet.TabSheetDisabling</td>
+ <td>/run/com.vaadin.tests.components.tabsheet.TabSheetDisabling</td>
<td></td>
</tr>
<tr>
@@ -23,7 +23,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetTabSheetDisabling::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/VTabsheetPanel[0]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstabsheetTabSheetDisabling::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/VTabsheetPanel[0]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -33,7 +33,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetTabSheetDisabling::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[5]/domChild[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstabsheetTabSheetDisabling::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[5]/domChild[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetTabSheetDisabling::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstabsheetTabSheetDisabling::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -58,7 +58,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetTabSheetDisabling::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstabsheetTabSheetDisabling::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -73,7 +73,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetTabSheetDisabling::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/VTabsheetPanel[0]/VButton[2]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstabsheetTabSheetDisabling::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/VTabsheetPanel[0]/VButton[2]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -83,7 +83,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetTabSheetDisabling::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[6]/domChild[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstabsheetTabSheetDisabling::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[6]/domChild[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -98,7 +98,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetTabSheetDisabling::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstabsheetTabSheetDisabling::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -108,7 +108,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetTabSheetDisabling::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstabsheetTabSheetDisabling::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -118,7 +118,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetTabSheetDisabling::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/VTabsheetPanel[0]/VButton[3]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstabsheetTabSheetDisabling::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/VTabsheetPanel[0]/VButton[3]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -133,7 +133,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetTabSheetDisabling::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/VTabsheetPanel[0]/VButton[1]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstabsheetTabSheetDisabling::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/VTabsheetPanel[0]/VButton[1]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -143,7 +143,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetTabSheetDisabling::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/VTabsheetPanel[0]/VButton[2]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstabsheetTabSheetDisabling::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/VTabsheetPanel[0]/VButton[2]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.html b/src/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.html
index 309eab2731..36e85c1b37 100644
--- a/src/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.html
+++ b/src/com/vaadin/tests/components/tabsheet/TabSheetWithoutTabCaption.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.tabsheet.TabSheetWithoutTabCaption</td>
+ <td>/run/com.vaadin.tests.components.tabsheet.TabSheetWithoutTabCaption</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html b/src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html
index 91b9a4898c..08b7869587 100644
--- a/src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html
+++ b/src/com/vaadin/tests/components/tabsheet/TabsheetTooltip.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.tabsheet.TabsheetTooltip</td>
+ <td>/run/com.vaadin.tests.components.tabsheet.TabsheetTooltip</td>
<td></td>
</tr>
<tr>
@@ -28,7 +28,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetTabsheetTooltip::/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>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>
<tr>
@@ -43,7 +43,7 @@
</tr>
<tr>
<td>mouseOver</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetTabsheetTooltip::/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>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>
@@ -58,7 +58,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetTabsheetTooltip::/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>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>
<tr>
@@ -68,7 +68,7 @@
</tr>
<tr>
<td>mouseOver</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetTabsheetTooltip::/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>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>
<tr>
diff --git a/src/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.html b/src/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.html
index 207c6da909..3da03edb6a 100644
--- a/src/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.html
+++ b/src/com/vaadin/tests/components/tabsheet/VerticalScrollbarPosition.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.tabsheet.VerticalScrollbarPosition</td>
+ <td>/run/com.vaadin.tests.components.tabsheet.VerticalScrollbarPosition</td>
<td></td>
</tr>
<tr>
@@ -28,7 +28,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetVerticalScrollbarPosition::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
+ <td>vaadin=runcomvaadintestscomponentstabsheetVerticalScrollbarPosition::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/domChild[0]/domChild[1]/domChild[1]</td>
<td></td>
</tr>
<tr>
@@ -43,7 +43,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetVerticalScrollbarPosition::/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>vaadin=runcomvaadintestscomponentstabsheetVerticalScrollbarPosition::/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>
<tr>
@@ -58,7 +58,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentstabsheetVerticalScrollbarPosition::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentstabsheetVerticalScrollbarPosition::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VTabsheet[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html b/src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html
index 5691f71a5a..2c2baca773 100644
--- a/src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html
+++ b/src/com/vaadin/tests/components/tree/TreeNodeCaptionWrapping.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.tree.TreeNodeCaptionWrapping</td>
+ <td>/run/com.vaadin.tests.components.tree.TreeNodeCaptionWrapping</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.html b/src/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.html
index 8cf62a063a..2e15d8d645 100644
--- a/src/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.html
+++ b/src/com/vaadin/tests/components/window/CenteredWindowWithUndefinedSize.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.window.CenteredWindowWithUndefinedSize</td>
+ <td>/run/com.vaadin.tests.components.window.CenteredWindowWithUndefinedSize</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/window/EmbeddedInSubWindow.html b/src/com/vaadin/tests/components/window/EmbeddedInSubWindow.html
index e6480969d5..d74e09dd6a 100644
--- a/src/com/vaadin/tests/components/window/EmbeddedInSubWindow.html
+++ b/src/com/vaadin/tests/components/window/EmbeddedInSubWindow.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.window.EmbeddedInSubWindow</td>
+ <td>/run/com.vaadin.tests.components.window.EmbeddedInSubWindow</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/window/SubwindowInvalidLayout.html b/src/com/vaadin/tests/components/window/SubwindowInvalidLayout.html
index 307a9ca712..9d54eafd02 100644
--- a/src/com/vaadin/tests/components/window/SubwindowInvalidLayout.html
+++ b/src/com/vaadin/tests/components/window/SubwindowInvalidLayout.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.window.SubwindowInvalidLayout</td>
+ <td>/run/com.vaadin.tests.components.window.SubwindowInvalidLayout</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.html b/src/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.html
index 3f0e95fa13..f926696d63 100644
--- a/src/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.html
+++ b/src/com/vaadin/tests/components/window/TestTooSmallSubwindowSize.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.window.TestTooSmallSubwindowSize</td>
+ <td>/run/com.vaadin.tests.components.window.TestTooSmallSubwindowSize</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 fff444fe21..51aabc7e8f 100644
--- a/src/com/vaadin/tests/components/window/UndefinedWidthSubWindow.html
+++ b/src/com/vaadin/tests/components/window/UndefinedWidthSubWindow.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.window.UndefinedWidthSubWindow</td>
+ <td>/run/com.vaadin.tests.components.window.UndefinedWidthSubWindow</td>
<td></td>
</tr>
<tr>
diff --git a/src/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.html b/src/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.html
index 6511221bc8..4923bff58a 100644
--- a/src/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.html
+++ b/src/com/vaadin/tests/components/window/WindowShouldRemoveActionHandler.html
@@ -13,7 +13,7 @@
</thead><tbody>
<tr>
<td>open</td>
- <td>/Vaadin6.1/run/com.vaadin.tests.components.window.WindowShouldRemoveActionHandler</td>
+ <td>/run/com.vaadin.tests.components.window.WindowShouldRemoveActionHandler</td>
<td></td>
</tr>
<tr>
@@ -23,7 +23,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentswindowWindowShouldRemoveActionHandler::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentswindowWindowShouldRemoveActionHandler::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -33,7 +33,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentswindowWindowShouldRemoveActionHandler::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentswindowWindowShouldRemoveActionHandler::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[2]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -48,7 +48,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentswindowWindowShouldRemoveActionHandler::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentswindowWindowShouldRemoveActionHandler::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -63,7 +63,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentswindowWindowShouldRemoveActionHandler::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentswindowWindowShouldRemoveActionHandler::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -73,7 +73,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentswindowWindowShouldRemoveActionHandler::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentswindowWindowShouldRemoveActionHandler::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[3]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
@@ -88,7 +88,7 @@
</tr>
<tr>
<td>click</td>
- <td>vaadin=Vaadin61runcomvaadintestscomponentswindowWindowShouldRemoveActionHandler::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
+ <td>vaadin=runcomvaadintestscomponentswindowWindowShouldRemoveActionHandler::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[1]/VButton[0]/domChild[0]/domChild[0]</td>
<td></td>
</tr>
<tr>
diff --git a/tests/test.xml b/tests/test.xml
index 226d965bba..7ac2aca772 100644
--- a/tests/test.xml
+++ b/tests/test.xml
@@ -90,8 +90,11 @@
<fail unless="com.vaadin.testbench.deployment.url" message="The 'com.vaadin.testbench.deployment.url' property must be defined."/>
</target>
+ <target name="run-tests" if="server.start.succeeded" depends="execute-tests">
+ </target>
+
<!-- This target runs the generated and compiled junit tests -->
- <target name="run-tests" depends="compile-tests,remove-error-screens">
+ <target name="execute-tests" depends="compile-tests,remove-error-screens">
<junit fork="yes" printsummary="withOutAndErr">
<classpath>
<path refid="classpath" />