diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2014-08-25 11:02:09 +0300 |
|---|---|---|
| committer | Teemu Suo-Anttila <teemusa@vaadin.com> | 2014-09-09 11:44:01 +0000 |
| commit | 69798ea10a289afe384617def233992eb80c9fda (patch) | |
| tree | b7c213cf550d84fc875b55e38b8c7187f523a33c /uitest | |
| parent | eba0c3dd709f60a123860a609a50daa5558588d4 (diff) | |
| download | vaadin-framework-69798ea10a289afe384617def233992eb80c9fda.tar.gz vaadin-framework-69798ea10a289afe384617def233992eb80c9fda.zip | |
Implement client-side editor row widget binding (#13334)
Change-Id: I898d89cecc2d1c552a3cc32461d612d55d1babd7
Diffstat (limited to 'uitest')
2 files changed, 32 insertions, 0 deletions
diff --git a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorRowClientTest.java b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorRowClientTest.java index 5a4568259d..5c19e29f17 100644 --- a/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorRowClientTest.java +++ b/uitest/src/com/vaadin/tests/components/grid/basicfeatures/client/GridEditorRowClientTest.java @@ -15,16 +15,22 @@ */ package com.vaadin.tests.components.grid.basicfeatures.client; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import java.util.List; + import org.junit.Before; import org.junit.Test; +import org.openqa.selenium.By; import org.openqa.selenium.Keys; import org.openqa.selenium.NoSuchElementException; +import org.openqa.selenium.WebElement; import org.openqa.selenium.interactions.Actions; import com.vaadin.tests.components.grid.basicfeatures.GridBasicClientFeaturesTest; +import com.vaadin.tests.components.grid.basicfeatures.GridBasicFeatures; public class GridEditorRowClientTest extends GridBasicClientFeaturesTest { @@ -71,4 +77,19 @@ public class GridEditorRowClientTest extends GridBasicClientFeaturesTest { new Actions(getDriver()).sendKeys(Keys.ENTER).perform(); assertNull(getEditorRow()); } + + @Test + public void testWidgetBinding() throws Exception { + selectMenuPath("Component", "State", "Editor row", "Edit row 100"); + WebElement editorRow = getEditorRow(); + + List<WebElement> widgets = editorRow.findElements(By + .className("gwt-TextBox")); + + assertEquals(GridBasicFeatures.COLUMNS, widgets.size()); + + for (int i = 0; i < GridBasicFeatures.COLUMNS; ++i) { + assertEquals("Column " + i, widgets.get(i).getAttribute("value")); + } + } } diff --git a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java b/uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java index 9cf56439d8..8055508f71 100644 --- a/uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java +++ b/uitest/src/com/vaadin/tests/widgetset/client/grid/GridBasicClientFeaturesWidget.java @@ -27,8 +27,11 @@ import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.ui.Button; import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.Label; +import com.google.gwt.user.client.ui.TextBox; +import com.google.gwt.user.client.ui.Widget; import com.vaadin.client.ui.VLabel; import com.vaadin.client.ui.grid.Cell; +import com.vaadin.client.ui.grid.EditorRowHandler; import com.vaadin.client.ui.grid.FlyweightCell; import com.vaadin.client.ui.grid.Grid; import com.vaadin.client.ui.grid.Grid.AbstractGridKeyEvent; @@ -152,6 +155,14 @@ public class GridBasicClientFeaturesWidget extends grid.getElement().setId("testComponent"); grid.setDataSource(ds); grid.setSelectionMode(SelectionMode.NONE); + grid.getEditorRow().setHandler(new EditorRowHandler<List<Data>>() { + @Override + public Widget getWidget(GridColumn<?, List<Data>> column) { + TextBox tb = new TextBox(); + tb.setText("Column " + grid.getColumns().indexOf(column)); + return tb; + } + }); sorter = new ListSorter<List<Data>>(grid); |