From 48893c2135d66a0de2c24acec3e7fb659ec85f7f Mon Sep 17 00:00:00 2001 From: Automerge Date: Fri, 27 Apr 2012 11:39:21 +0000 Subject: [merge from 6.7] Use equals instead of == to compare item ids (#8712). Using == will fail at least with JPAContainer as the entity provider provides the id instances and it is not guaranteed that the same instance is returned every time (e.g. if using a Long the longs represent the same number but are not the same instance) svn changeset:23655/svn branch:6.8 --- ...TableWithContainerRequiringEqualsForItemId.html | 97 ++++++++++++++++ ...TableWithContainerRequiringEqualsForItemId.java | 128 +++++++++++++++++++++ 2 files changed, 225 insertions(+) create mode 100644 tests/testbench/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.html create mode 100644 tests/testbench/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java (limited to 'tests') diff --git a/tests/testbench/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.html b/tests/testbench/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.html new file mode 100644 index 0000000000..5364b1cd1e --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.html @@ -0,0 +1,97 @@ + + + + + + +New Test + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
New Test
open/run/com.vaadin.tests.components.table.TableWithContainerRequiringEqualsForItemId?debug&restartApplication
mouseClickvaadin=runcomvaadintestscomponentstableTableWithContainerRequiringEqualsForItemId::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/domChild[0]/domChild[0]523,81
clickvaadin=runcomvaadintestscomponentstableTableWithContainerRequiringEqualsForItemId::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VButton[0]/domChild[0]/domChild[0]
assertTextvaadin=runcomvaadintestscomponentstableTableWithContainerRequiringEqualsForItemId::PID_SLog_row_01. Button Button999 clicked
clickvaadin=runcomvaadintestscomponentstableTableWithContainerRequiringEqualsForItemId::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[14]/VButton[0]/domChild[0]/domChild[0]
assertTextvaadin=runcomvaadintestscomponentstableTableWithContainerRequiringEqualsForItemId::PID_SLog_row_02. Button Button985 clicked
mouseClickvaadin=runcomvaadintestscomponentstableTableWithContainerRequiringEqualsForItemId::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]19,7
contextmenuvaadin=runcomvaadintestscomponentstableTableWithContainerRequiringEqualsForItemId::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]
assertTextvaadin=runcomvaadintestscomponentstableTableWithContainerRequiringEqualsForItemId::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]0
clickvaadin=runcomvaadintestscomponentstableTableWithContainerRequiringEqualsForItemId::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VButton[0]/domChild[0]/domChild[0]
assertTextvaadin=runcomvaadintestscomponentstableTableWithContainerRequiringEqualsForItemId::PID_SLog_row_03. Button Button0 clicked
mouseClickvaadin=runcomvaadintestscomponentstableTableWithContainerRequiringEqualsForItemId::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[0]/domChild[2]8,15
contextmenuvaadin=runcomvaadintestscomponentstableTableWithContainerRequiringEqualsForItemId::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]
assertTextvaadin=runcomvaadintestscomponentstableTableWithContainerRequiringEqualsForItemId::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[0]/domChild[0]999
clickvaadin=runcomvaadintestscomponentstableTableWithContainerRequiringEqualsForItemId::/VVerticalLayout[0]/ChildComponentContainer[1]/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/FocusableScrollPanel[0]/VScrollTable$VScrollTableBody[0]/VScrollTable$VScrollTableBody$VScrollTableRow[0]/VButton[0]/domChild[0]/domChild[0]
assertTextvaadin=runcomvaadintestscomponentstableTableWithContainerRequiringEqualsForItemId::PID_SLog_row_04. Button Button999 clicked
+ + diff --git a/tests/testbench/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java b/tests/testbench/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java new file mode 100644 index 0000000000..1b0335b673 --- /dev/null +++ b/tests/testbench/com/vaadin/tests/components/table/TableWithContainerRequiringEqualsForItemId.java @@ -0,0 +1,128 @@ +package com.vaadin.tests.components.table; + +import java.util.Date; + +import com.vaadin.data.util.BeanContainer; +import com.vaadin.data.util.BeanItem; +import com.vaadin.tests.components.TestBase; +import com.vaadin.tests.util.Log; +import com.vaadin.ui.Button; +import com.vaadin.ui.Button.ClickEvent; +import com.vaadin.ui.Component; +import com.vaadin.ui.Table; +import com.vaadin.ui.themes.Reindeer; + +public class TableWithContainerRequiringEqualsForItemId extends TestBase { + + private MyEntityContainer container = new MyEntityContainer(); + private Log log = new Log(10); + + public static class MyEntityContainer extends BeanContainer { + + public MyEntityContainer() { + super(MyEntity.class); + setBeanIdResolver(new BeanIdResolver() { + + public Long getIdForBean(MyEntity bean) { + // Return a new instance every time to ensure Table can + // handle it + return new Long(bean.getId()); + } + }); + + } + + @Override + public Long getIdByIndex(int index) { + // Explicitly get the id using the resolver to make sure the + // instance does not stay the same + BeanItem beanItem = getItem(super.getIdByIndex(index)); + return getBeanIdResolver().getIdForBean(beanItem.getBean()); + }; + + } + + @Override + protected void setup() { + Table t = new Table("Table with 1000 item"); + t.addGeneratedColumn("Actions", new Table.ColumnGenerator() { + public Component generateCell(final Table source, + final Object itemId, final Object columnId) { + Button tripFolderLink = new Button("Button" + itemId); + tripFolderLink.addListener(new Button.ClickListener() { + public void buttonClick(final ClickEvent event) { + log.log("Button " + event.getButton().getCaption() + + " clicked"); + } + }); + tripFolderLink.setStyleName(Reindeer.BUTTON_SMALL); + return tripFolderLink; + } + }); + + for (int i = 0; i < 1000; i++) { + MyEntity myEntity = new MyEntity(i + "st"); + myEntity.setCreated(new Date(new Date().getTime() - 24 * 60 * 60 + * 1000L)); + myEntity.setId(i); + container.addBean(myEntity); + // entityProvider.addEntity(myEntity); + } + + t.setContainerDataSource(container); + t.setVisibleColumns(new String[] { "id", "created", "name", "Actions" }); + + addComponent(t); + addComponent(log); + + t.sort(new Object[] { "id" }, new boolean[] { false }); + + } + + @Override + protected String getDescription() { + return "Test that verifies that Table works correctly with containers which do not return the same instance of the itemId object but instead requires an itemId.equals(otherItemId) check"; + } + + @Override + protected Integer getTicketNumber() { + return 8712; + } + + public static class MyEntity { + + private long id; + + private String name; + + private Date created; + + public MyEntity() { + } + + public MyEntity(String string) { + name = string; + } + + public String getName() { + return name; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + } + +} -- cgit v1.2.3