aboutsummaryrefslogtreecommitdiffstats
path: root/uitest/src/com
diff options
context:
space:
mode:
authorTeemu Suo-Anttila <teemusa@vaadin.com>2015-08-31 14:37:30 +0300
committerTeemu Suo-Anttila <teemusa@vaadin.com>2015-09-02 12:35:22 +0000
commitac66a3d17446571c6ebace16cb3930df44381ad7 (patch)
treee541db2569a7d73a3da89314d59944f9bfb5d700 /uitest/src/com
parent67a1ecf6a12b2b749458022ade72beac398a3038 (diff)
downloadvaadin-framework-ac66a3d17446571c6ebace16cb3930df44381ad7.tar.gz
vaadin-framework-ac66a3d17446571c6ebace16cb3930df44381ad7.zip
Redesign RpcDataSourceConnector pinning RPC requests (#18692)
This patch removes DataProviderKeyMapper which was mostly dead code already. Uses a regular KeyMapper instead. Change-Id: Ic97d1dc827d45fde65bcddc0414bfe711032620c
Diffstat (limited to 'uitest/src/com')
-rw-r--r--uitest/src/com/vaadin/tests/components/grid/CustomRendererTest.java4
-rw-r--r--uitest/src/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/uitest/src/com/vaadin/tests/components/grid/CustomRendererTest.java b/uitest/src/com/vaadin/tests/components/grid/CustomRendererTest.java
index 7d706ecd30..d5e01a9de8 100644
--- a/uitest/src/com/vaadin/tests/components/grid/CustomRendererTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/CustomRendererTest.java
@@ -47,8 +47,8 @@ public class CustomRendererTest extends MultiBrowserTest {
.getText());
grid.getCell(0, 1).click();
- assertEquals("row: 0, key: 0", grid.getCell(0, 1).getText());
- assertEquals("key: 0, itemId: " + CustomRenderer.ITEM_ID,
+ assertEquals("row: 0, key: 1", grid.getCell(0, 1).getText());
+ assertEquals("key: 1, itemId: " + CustomRenderer.ITEM_ID,
findDebugLabel().getText());
}
diff --git a/uitest/src/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java b/uitest/src/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java
index b38178b156..2e86053ef3 100644
--- a/uitest/src/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java
+++ b/uitest/src/com/vaadin/tests/components/grid/JavaScriptRenderersTest.java
@@ -43,6 +43,6 @@ public class JavaScriptRenderersTest extends MultiBrowserTest {
// Verify onbrowserevent
cell_1_1.click();
Assert.assertTrue(cell_1_1.getText().startsWith(
- "Clicked 1 with key 1 at"));
+ "Clicked 1 with key 2 at"));
}
}