Fix RendererTest to use AlwaysLockedVaadinSession

Change-Id: If78859ed34dde9e32e4e4c426cb98024e156c575

diff --git a/server/src/com/vaadin/data/RpcDataProviderExtension.java b/server/src/com/vaadin/data/RpcDataProviderExtension.java
index 1834822d9913ad550b74c0d629b5110a27e2c4b5..fd1ca6b9e8acf9eb4fd9813c1703917f7ef5e6bb 100644 (file)
--- a/server/src/com/vaadin/data/RpcDataProviderExtension.java
+++ b/server/src/com/vaadin/data/RpcDataProviderExtension.java
@@ -78,7 +78,7 @@ public class RpcDataProviderExtension extends AbstractExtension {
      * itemId ⇆ key mapping is not needed anymore. In other words, this
      * doesn't leak memory.
      */
-    public class DataProviderKeyMapper {
+    public class DataProviderKeyMapper implements Serializable {
         private final BiMap<Integer, Object> indexToItemId = HashBiMap.create();
         private final BiMap<Object, String> itemIdToKey = HashBiMap.create();
         private Set<Object> pinnedItemIds = new HashSet<Object>();

diff --git a/server/tests/src/com/vaadin/tests/server/component/grid/RendererTest.java b/server/tests/src/com/vaadin/tests/server/component/grid/RendererTest.java
index 1ea501ff01fbf23f74f01b18a65eec8618f4b116..5583fc02e85388cc02b4e434534a088ced2716c3 100644 (file)
--- a/server/tests/src/com/vaadin/tests/server/component/grid/RendererTest.java
+++ b/server/tests/src/com/vaadin/tests/server/component/grid/RendererTest.java
@@ -31,14 +31,11 @@ import com.vaadin.data.util.converter.Converter;
 import com.vaadin.data.util.converter.Converter.ConversionException;
 import com.vaadin.data.util.converter.StringToIntegerConverter;
 import com.vaadin.server.VaadinSession;
+import com.vaadin.tests.util.AlwaysLockedVaadinSession;
 import com.vaadin.ui.components.grid.Grid;
 import com.vaadin.ui.components.grid.GridColumn;
 import com.vaadin.ui.components.grid.renderers.TextRenderer;
 
-/**
- * @since 7.4
- * @author Vaadin Ltd
- */
 public class RendererTest {
 
     private static class TestBean {
@@ -97,7 +94,7 @@ public class RendererTest {
 
     @Before
     public void setUp() {
-        VaadinSession.setCurrent(new VaadinSession(null));
+        VaadinSession.setCurrent(new AlwaysLockedVaadinSession(null));
 
         IndexedContainer c = new IndexedContainer();