Revert immediate tests, deprecate HasUserSelectionAllowed

2 files changed, 1 insertions, 36 deletions

diff --git a/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java
index f9a5062ac1..a72222d325 100644
--- a/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java
+++ b/compatibility-server/src/main/java/com/vaadin/v7/ui/Grid.java
@@ -1150,6 +1150,7 @@ public class Grid extends AbstractComponent
          *
          * @since 7.7.7
          */
+        @Deprecated
         public interface HasUserSelectionAllowed extends SelectionModel {
 
             /**
diff --git a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/AbsFieldValidatorsTest.java b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/AbsFieldValidatorsTest.java
index 5aee75af36..7dbc3b766d 100644
--- a/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/AbsFieldValidatorsTest.java
+++ b/compatibility-server/src/test/java/com/vaadin/v7/tests/server/component/abstractfield/AbsFieldValidatorsTest.java
@@ -69,46 +69,10 @@ public class AbsFieldValidatorsTest {
     }
 
     @Test
-    public void validatorShouldMakeImmediate() {
-        assertFalse("field should not be immediate by default",
-                field.isImmediate());
-        field.addValidator(validator);
-        assertTrue("field should be immediate when it has a validator",
-                field.isImmediate());
-    }
-
-    @Test
     public void nonImmediateFieldWithValidator() {
         field.setImmediate(false);
         field.addValidator(validator);
         assertFalse("field should be non-immediate because explicitly set",
                 field.isImmediate());
     }
-
-    @Test
-    public void removeValidatorMakesNonImmediate() {
-        field.addValidator(validator);
-        field.removeValidator(validator);
-        assertFalse("field should be non-immediate after validator was removed",
-                field.isImmediate());
-    }
-
-    @Test
-    public void requiredMakesImmediate() {
-        assertFalse("field should not be immediate by default",
-                field.isImmediate());
-        field.setRequired(true);
-        assertTrue("field should be immediate when it is required",
-                field.isImmediate());
-    }
-
-    @Test
-    public void removeRequiredMakesNonImmediate() {
-        assertFalse("field should not be immediate by default",
-                field.isImmediate());
-        field.setRequired(true);
-        field.setRequired(false);
-        assertFalse("field should not be immediate even though it was required",
-                field.isImmediate());
-    }
 }