From 5737ec8704d717084ca91494f7bf9b08ad3eec8c Mon Sep 17 00:00:00 2001 From: John Alhroos Date: Mon, 15 Aug 2011 13:50:27 +0000 Subject: Added tooltips to Table cells and rows (ItemDescriptionGenerator) + Testbench test for them #5414 svn changeset:20392/svn branch:6.7 --- .../table/TableItemDescriptionGeneratorTest.java | 75 +++++++++++++++++++++ .../tests/components/table/TableTooltips.html | 77 ++++++++++++++++++++++ 2 files changed, 152 insertions(+) create mode 100644 tests/src/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.java create mode 100644 tests/src/com/vaadin/tests/components/table/TableTooltips.html (limited to 'tests') diff --git a/tests/src/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.java b/tests/src/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.java new file mode 100644 index 0000000000..2f53b91107 --- /dev/null +++ b/tests/src/com/vaadin/tests/components/table/TableItemDescriptionGeneratorTest.java @@ -0,0 +1,75 @@ +package com.vaadin.tests.components.table; + +import com.vaadin.data.Container; +import com.vaadin.data.Item; +import com.vaadin.data.util.IndexedContainer; +import com.vaadin.tests.components.TestBase; +import com.vaadin.ui.Button; +import com.vaadin.ui.Component; +import com.vaadin.ui.Label; +import com.vaadin.ui.Table; +import com.vaadin.ui.AbstractSelect.ItemDescriptionGenerator; +import com.vaadin.ui.TextField; + +public class TableItemDescriptionGeneratorTest extends TestBase { + + private final String COLUMN1_PROPERTY_ID = "Text - Cell description"; + private final String COLUMN2_PROPERTY_ID = "Text - Row description"; + private final String COLUMN3_PROPERTY_ID = "Widget"; + + @Override + protected void setup() { + final Table table = new Table(); + table.setDebugId("table"); + table.setContainerDataSource(createContainer()); + addComponent(table); + + table.setItemDescriptionGenerator(new ItemDescriptionGenerator() { + public String generateDescription(Component source, Object itemId, + Object propertyId) { + if(propertyId == null){ + return "Row description "+ itemId; + } else if(propertyId == COLUMN1_PROPERTY_ID) { + return "Cell description " + itemId +","+propertyId; + } + return null; + } + }); + + table.addGeneratedColumn(COLUMN3_PROPERTY_ID, new Table.ColumnGenerator() { + + public Component generateCell(Table source, Object itemId, Object columnId) { + TextField lbl = new TextField(); + lbl.setDescription("Textfields own description"); + return lbl; + } + }); + } + + @Override + protected String getDescription() { + return "Cells and rows should have tooltips"; + } + + @Override + protected Integer getTicketNumber() { + return 5414; + } + + private Container createContainer() { + IndexedContainer container = new IndexedContainer(); + container.addContainerProperty(COLUMN1_PROPERTY_ID, String.class, ""); + container.addContainerProperty(COLUMN2_PROPERTY_ID, String.class, ""); + // container.addContainerProperty(COLUMN3_PROPERTY_ID, String.class, ""); + + for (int i = 0; i < 5; i++) { + Item item = container.addItem("item " + i); + item.getItemProperty(COLUMN1_PROPERTY_ID).setValue("first" + i); + item.getItemProperty(COLUMN2_PROPERTY_ID).setValue("middle" + i); + // item.getItemProperty(COLUMN3_PROPERTY_ID).setValue("last" + i); + } + + return container; + } + +} diff --git a/tests/src/com/vaadin/tests/components/table/TableTooltips.html b/tests/src/com/vaadin/tests/components/table/TableTooltips.html new file mode 100644 index 0000000000..989fb865c5 --- /dev/null +++ b/tests/src/com/vaadin/tests/components/table/TableTooltips.html @@ -0,0 +1,77 @@ + + + + + + +New Test + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
New Test
open/run/com.vaadin.tests.components.table.TableItemDescriptionGeneratorTest?restartApplication
showTooltipvaadin=runcomvaadintestscomponentstableTableItemDescriptionGeneratorTest::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[3]/domChild[0]/domChild[0]57,5
pause10001000
assertTextvaadin=runcomvaadintestscomponentstableTableItemDescriptionGeneratorTest::Root/VTooltip[0]/FlowPanel[0]/domChild[1]Cell description item 3,Text - Cell description
mouseClickvaadin=runcomvaadintestscomponentstableTableItemDescriptionGeneratorTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[0]810,153
showTooltipvaadin=runcomvaadintestscomponentstableTableItemDescriptionGeneratorTest::PID_Stable/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[1]/domChild[1]/domChild[0]57,12
pause10001000
assertTextvaadin=runcomvaadintestscomponentstableTableItemDescriptionGeneratorTest::Root/VTooltip[0]/FlowPanel[0]/domChild[1]Row description item 1
mouseClickvaadin=runcomvaadintestscomponentstableTableItemDescriptionGeneratorTest::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[0]1011,283
showTooltipvaadin=runcomvaadintestscomponentstableTableItemDescriptionGeneratorTest::PID_Stable/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[4]/VTextField[0]58,10
pause10001000
assertTextvaadin=runcomvaadintestscomponentstableTableItemDescriptionGeneratorTest::Root/VTooltip[0]/FlowPanel[0]/domChild[1]Textfields own description
+ + -- cgit v1.2.3