Blocked merge of revisions related to 6.7.7 release

svn changeset:23522/svn branch:6.8

1 files changed, 16 insertions, 6 deletions

diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java b/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java
index 32b80e0bcd..c5bd688b3d 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java
+++ b/tests/server-side/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetach.java
@@ -16,7 +16,7 @@ public class RemoveListenersOnDetach {
     AbstractField field = new AbstractField() {
         @Override
         public Class<?> getType() {
-            return null;
+            return int.class;
         }
 
         @Override
@@ -34,17 +34,20 @@ public class RemoveListenersOnDetach {
     };
 
     Property property = new AbstractProperty() {
+        private int value;
+
         public Object getValue() {
-            return null;
+            return value;
         }
 
         public void setValue(Object newValue) throws ReadOnlyException,
                 ConversionException {
+            value = (Integer) newValue;
             fireValueChange();
         }
 
         public Class<?> getType() {
-            return null;
+            return int.class;
         }
     };
 
@@ -52,21 +55,28 @@ public class RemoveListenersOnDetach {
     public void testAttachDetach() {
         field.setPropertyDataSource(property);
 
-        property.setValue(null);
+        property.setValue(1);
         property.setReadOnly(true);
+        assertEquals(1, field.getValue());
         assertEquals(1, numValueChanges);
         assertEquals(1, numReadOnlyChanges);
 
         field.attach();
-        property.setValue(null);
+        property.setValue(2);
         property.setReadOnly(false);
+        assertEquals(2, field.getValue());
         assertEquals(2, numValueChanges);
         assertEquals(2, numReadOnlyChanges);
 
         field.detach();
-        property.setValue(null);
+        property.setValue(3);
         property.setReadOnly(true);
+        assertEquals(3, field.getValue());
         assertEquals(2, numValueChanges);
         assertEquals(2, numReadOnlyChanges);
+
+        field.attach();
+        assertEquals(3, field.getValue());
+        assertEquals(3, numValueChanges);
     }
 }