Fixed table height in test for consistency and added screenshots. Also removed extern...

svn changeset:14894/svn branch:6.4

diff --git a/tests/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.html b/tests/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.html
index f82b1aedd30163a97ec567206e76095359cfc75b..62e3786a44ceb5cb6523c1b827c5e95486d48b05 100644 (file)
--- a/tests/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.html
+++ b/tests/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.html
@@ -13,40 +13,117 @@
 </thead><tbody>
 <tr>
        <td>open</td>
-       <td>/run/com.vaadin.tests.components.table.LabelEmbeddedClickThroughForTable</td>
+       <td>/run/com.vaadin.tests.components.table.LabelEmbeddedClickThroughForTable?restartApplication</td>
        <td></td>
 </tr>
 <tr>
-       <td>waitForVaadin</td>
-       <td></td>
-       <td></td>
+       <td>mouseClick</td>
+       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+       <td>32,13</td>
 </tr>
+<!--  Work around for Opera issue #5597 -->
 <tr>
-       <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VLabel[1]/domChild[0]</td>
-       <td></td>
+       <td>mouseClick</td>
+       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
+       <td>30,12</td>
 </tr>
 <tr>
-       <td>waitForVaadin</td>
-       <td></td>
-       <td></td>
+       <td>mouseClick</td>
+       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]</td>
+       <td>32,13</td>
+</tr>
+<!--  Work around done -->
+<tr>
+       <td>assertCSSClass</td>
+       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
+       <td>v-selected</td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
+       <td>30,12</td>
+</tr>
+<tr>
+       <td>assertCSSClass</td>
+       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]</td>
+       <td>v-selected</td>
 </tr>
 <tr>
        <td>screenCapture</td>
        <td></td>
-       <td></td>
+       <td>row-2-selected</td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VLabel[0]</td>
+       <td>32,9</td>
 </tr>
+<!--  Moved here to avoid Opera issue #5588 -->
 <tr>
-       <td>click</td>
-       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VLabel[1]/domChild[0]</td>
+       <td>screenCapture</td>
        <td></td>
+       <td>row-1-selected</td>
+</tr>
+<tr>
+       <td>assertCSSClass</td>
+       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
+       <td>v-selected</td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VLabel[0]</td>
+       <td>22,6</td>
 </tr>
 <tr>
-       <td>waitForVaadin</td>
+       <td>assertCSSClass</td>
+       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]</td>
+       <td>v-selected</td>
+</tr>
+<tr>
+       <td>screenCapture</td>
        <td></td>
+       <td>row-2-selected</td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VLabel[1]/domChild[0]</td>
        <td></td>
 </tr>
-
+<tr>
+       <td>assertCSSClass</td>
+       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
+       <td>v-selected</td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VLabel[0]</td>
+       <td>22,6</td>
+</tr>
+<tr>
+       <td>assertCSSClass</td>
+       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]</td>
+       <td>v-selected</td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VEmbedded[0]/domChild[0]</td>
+       <td>19,14</td>
+</tr>
+<tr>
+       <td>assertCSSClass</td>
+       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]</td>
+       <td>v-selected</td>
+</tr>
+<tr>
+       <td>mouseClick</td>
+       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VEmbedded[0]/domChild[0]</td>
+       <td>16,15</td>
+</tr>
+<tr>
+       <td>assertCSSClass</td>
+       <td>vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]</td>
+       <td>v-selected</td>
+</tr>
 </tbody></table>
 </body>
 </html>

diff --git a/tests/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java b/tests/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java
index 504e3b1aafd52f03c18a39170c044a3aa6acdf21..a54c3ce4477fb004676f28b21149dea4e6b5fea6 100644 (file)
--- a/tests/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java
+++ b/tests/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java
@@ -25,6 +25,7 @@ public class LabelEmbeddedClickThroughForTable extends TestBase {
     @Override
     protected void setup() {
         Table table = new Table();
+        table.setHeight("500px");
         table.setSelectable(true);
         table.addContainerProperty("Column 1", String.class, "");
         table.addContainerProperty("Column 2", Component.class, "");
@@ -46,7 +47,7 @@ public class LabelEmbeddedClickThroughForTable extends TestBase {
         item.getItemProperty("Column 3")
                 .setValue(
                         new Label(
-                                "<a href=\"http://www.vaadin.com\" target=_blank>Label A</a>",
+                                "<a style=\"color: blue\" href=\"javascript:false\">Label A</a>",
                                 Label.CONTENT_XHTML));
         item.getItemProperty("Column 4").setValue(
                 new Embedded("", new ThemeResource(
@@ -55,9 +56,8 @@ public class LabelEmbeddedClickThroughForTable extends TestBase {
         table.addListener(new ItemClickListener() {
 
             public void itemClick(ItemClickEvent event) {
-                getMainWindow().showNotification(
-                        "Clickevent on item " + event.getItemId()
-                                + ", column: " + event.getPropertyId());
+                System.out.println("Clickevent on item " + event.getItemId()
+                        + ", column: " + event.getPropertyId());
 
             }