From: Artur Signell Date: Tue, 14 Sep 2010 10:33:05 +0000 (+0000) Subject: Fixed table height in test for consistency and added screenshots. Also removed extern... X-Git-Tag: 6.7.0.beta1~1182 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ae74381de52b9b5a50314c1d0502eda5211df7b5;p=vaadin-framework.git Fixed table height in test for consistency and added screenshots. Also removed external link to avoid opening extra browser windows. 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 f82b1aedd3..62e3786a44 100644 --- a/tests/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.html +++ b/tests/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.html @@ -13,40 +13,117 @@ open - /run/com.vaadin.tests.components.table.LabelEmbeddedClickThroughForTable + /run/com.vaadin.tests.components.table.LabelEmbeddedClickThroughForTable?restartApplication - waitForVaadin - - + mouseClick + 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] + 32,13 + - click - 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] - + mouseClick + 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] + 30,12 - waitForVaadin - - + mouseClick + 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] + 32,13 + + + + assertCSSClass + vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0] + v-selected + + + mouseClick + 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] + 30,12 + + + assertCSSClass + vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1] + v-selected screenCapture - + row-2-selected + + + mouseClick + vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VLabel[0] + 32,9 + - click - 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] + screenCapture + row-1-selected + + + assertCSSClass + vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0] + v-selected + + + mouseClick + vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VLabel[0] + 22,6 - waitForVaadin + assertCSSClass + vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1] + v-selected + + + screenCapture + row-2-selected + + + mouseClick + 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] - + + assertCSSClass + vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0] + v-selected + + + mouseClick + vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[1]/VLabel[0] + 22,6 + + + assertCSSClass + vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1] + v-selected + + + mouseClick + 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] + 19,14 + + + assertCSSClass + vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0] + v-selected + + + mouseClick + 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] + 16,15 + + + assertCSSClass + vaadin=runcomvaadintestscomponentstableLabelEmbeddedClickThroughForTable::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1] + v-selected + diff --git a/tests/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java b/tests/src/com/vaadin/tests/components/table/LabelEmbeddedClickThroughForTable.java index 504e3b1aaf..a54c3ce447 100644 --- 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( - "Label A", + "Label 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()); }