Updated test to use the generic ComboBoxes test case

svn changeset:15198/svn branch:6.4

diff --git a/tests/src/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.html b/tests/src/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.html
index c7c10dbfbd06bf91e5e614fe7733cdf2cb449cae..77e66ff25c89816d964d324ac0bba9ee0f38b9e9 100644 (file)
--- a/tests/src/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.html
+++ b/tests/src/com/vaadin/tests/components/combobox/ComboBoxLargeIcons.html
@@ -13,100 +13,129 @@
 </thead><tbody>
 <tr>
        <td>open</td>
-       <td>/run/com.vaadin.tests.components.combobox.ComboBoxLargeIcons?restartApplication</td>
+       <td>/run/com.vaadin.tests.components.combobox.Comboboxes?restartApplication</td>
        <td></td>
 </tr>
+<tr>
+       <td>select</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::PID_Sselectaction-Icon/domChild[0]</td>
+       <td>label=16x16</td>
+</tr>
 <tr>
        <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxLargeIcons::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VFilterSelect[0]/domChild[1]</td>
+       <td>13,8</td>
+</tr>
+<tr>
+       <td>screenCapture</td>
+       <td></td>
+       <td>icons-16x16-page1</td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::Root/VFilterSelect$SuggestionPopup[0]/domChild[0]/domChild[2]/domChild[0]</td>
        <td>116,6</td>
 </tr>
 <tr>
-       <td>pressSpecialKey</td>
-       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxLargeIcons::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
-       <td>down</td>
+       <td>screenCapture</td>
+       <td></td>
+       <td>icons-16x16-page2</td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item0</td>
+       <td>378,1</td>
 </tr>
 <tr>
        <td>screenCapture</td>
        <td></td>
-       <td>first-page</td>
+       <td>icons-16x16-selected-1-3-5-9</td>
 </tr>
 <tr>
-       <td>pressSpecialKey</td>
-       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxLargeIcons::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
-       <td>down</td>
+       <td>select</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::PID_Sselectaction-Icon/domChild[0]</td>
+       <td>label=32x32</td>
 </tr>
 <tr>
-       <td>pressSpecialKey</td>
-       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxLargeIcons::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
-       <td>down</td>
+       <td>mouseClick</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[4]/VFilterSelect[0]/domChild[2]</td>
+       <td>8,13</td>
 </tr>
 <tr>
-       <td>pressSpecialKey</td>
-       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxLargeIcons::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
-       <td>down</td>
+       <td>screenCapture</td>
+       <td></td>
+       <td>icons-32x32-page2</td>
 </tr>
 <tr>
-       <td>pressSpecialKey</td>
-       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxLargeIcons::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
-       <td>down</td>
+       <td>mouseClick</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[1]</td>
+       <td>409,27</td>
 </tr>
 <tr>
-       <td>pressSpecialKey</td>
-       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxLargeIcons::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
-       <td>down</td>
+       <td>select</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::PID_Sselectaction-Icon/domChild[0]</td>
+       <td>label=64x64</td>
 </tr>
 <tr>
-       <td>pressSpecialKey</td>
-       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxLargeIcons::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
-       <td>down</td>
+       <td>mouseClick</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[9]/VFilterSelect[0]/domChild[1]</td>
+       <td>11,13</td>
 </tr>
 <tr>
-       <td>pressSpecialKey</td>
-       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxLargeIcons::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
-       <td>down</td>
+       <td>mouseClick</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item1</td>
+       <td>213,57</td>
 </tr>
 <tr>
-       <td>pressSpecialKey</td>
-       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxLargeIcons::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
-       <td>down</td>
+       <td>mouseClick</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[4]</td>
+       <td>535,43</td>
 </tr>
 <tr>
-       <td>pressSpecialKey</td>
-       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxLargeIcons::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
-       <td>down</td>
+       <td>mouseClick</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[8]/VFilterSelect[0]/domChild[1]</td>
+       <td>7,12</td>
 </tr>
 <tr>
-       <td>pressSpecialKey</td>
-       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxLargeIcons::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
-       <td>down</td>
+       <td>mouseClick</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::Root/VFilterSelect$SuggestionPopup[0]/VFilterSelect$SuggestionMenu[0]#item1</td>
+       <td>158,25</td>
 </tr>
 <tr>
-       <td>pressSpecialKey</td>
-       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxLargeIcons::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
-       <td>down</td>
+       <td>mouseClick</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[7]/VFilterSelect[0]/domChild[0]</td>
+       <td>16,9</td>
 </tr>
 <tr>
-       <td>screenCapture</td>
-       <td></td>
-       <td>second-page</td>
+       <td>mouseClick</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[7]/VFilterSelect[0]/domChild[0]</td>
+       <td>80,7</td>
+</tr>
+<tr>
+       <td>pressSpecialKey</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[7]/VFilterSelect[0]/domChild[0]</td>
+       <td>down</td>
 </tr>
 <tr>
        <td>pressSpecialKey</td>
-       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxLargeIcons::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[7]/VFilterSelect[0]/domChild[0]</td>
        <td>down</td>
 </tr>
 <tr>
        <td>pressSpecialKey</td>
-       <td>vaadin=runcomvaadintestscomponentscomboboxComboBoxLargeIcons::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VFilterSelect[0]/domChild[0]</td>
-       <td>enter</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[7]/VFilterSelect[0]/domChild[0]</td>
+       <td>down</td>
 </tr>
 <tr>
        <td>screenCapture</td>
        <td></td>
-       <td>pdf-icon</td>
+       <td>icons-64x64-page1-highlight-first</td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>vaadin=runcomvaadintestscomponentscomboboxComboboxes::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[6]/domChild[0]</td>
+       <td>510,1</td>
 </tr>
-
 </tbody></table>
 </body>
 </html>