Move old Field and AbstractField to compatibility package

Change-Id: Ia9b6f77763abac87ec61d1ee198cb8d41419a934

3 files changed, 1 insertions, 218 deletions

diff --git a/server/src/test/java/com/vaadin/tests/VaadinClasses.java b/server/src/test/java/com/vaadin/tests/VaadinClasses.java
index ad1119a8ad..ba56fcee35 100644
--- a/server/src/test/java/com/vaadin/tests/VaadinClasses.java
+++ b/server/src/test/java/com/vaadin/tests/VaadinClasses.java
@@ -29,7 +29,6 @@ import com.vaadin.ui.UI;
 import com.vaadin.ui.VerticalSplitPanel;
 import com.vaadin.ui.Window;
 import com.vaadin.ui.themes.BaseTheme;
-import com.vaadin.v7.ui.Field;
 
 @SuppressWarnings("deprecation")
 public class VaadinClasses {
@@ -63,15 +62,6 @@ public class VaadinClasses {
         }
     }
 
-    public static List<Class<? extends Field>> getFields() {
-        try {
-            return findClasses(Field.class, "com.vaadin.ui");
-        } catch (IOException e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
     public static List<Class<? extends BaseTheme>> getThemeClasses() {
         try {
             return findClasses(BaseTheme.class, "com.vaadin.ui.themes");
@@ -136,7 +126,7 @@ public class VaadinClasses {
 
     }
 
-    private static <T> List<Class<? extends T>> findClasses(Class<T> baseClass,
+    public static <T> List<Class<? extends T>> findClasses(Class<T> baseClass,
             String basePackage) throws IOException {
         return findClasses(baseClass, basePackage, new String[] {});
     }
diff --git a/server/src/test/java/com/vaadin/tests/server/component/FieldDefaultValuesTest.java b/server/src/test/java/com/vaadin/tests/server/component/FieldDefaultValuesTest.java
deleted file mode 100644
index ba2bccfb78..0000000000
--- a/server/src/test/java/com/vaadin/tests/server/component/FieldDefaultValuesTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright 2000-2016 Vaadin Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.tests.server.component;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Assert;
-import org.junit.Test;
-
-import com.vaadin.tests.VaadinClasses;
-import com.vaadin.ui.Slider;
-import com.vaadin.v7.ui.Field;
-
-public class FieldDefaultValuesTest {
-
-    @Test
-    public void testFieldsHaveDefaultValueAfterClear() throws Exception {
-        for (Field<?> field : createFields()) {
-            Object originalValue = field.getValue();
-
-            field.clear();
-
-            Object clearedValue = field.getValue();
-
-            Assert.assertEquals(
-                    "Expected to get default value after clearing "
-                            + field.getClass().getName(),
-                    originalValue, clearedValue);
-        }
-    }
-
-    @Test
-    public void testFieldsAreEmptyAfterClear() throws Exception {
-        for (Field<?> field : createFields()) {
-            field.clear();
-
-            if (field instanceof Slider) {
-                Assert.assertFalse(
-                        "Slider should not be empty even after being cleared",
-                        field.isEmpty());
-
-            } else {
-                Assert.assertTrue(
-                        field.getClass().getName()
-                                + " should be empty after being cleared",
-                        field.isEmpty());
-            }
-        }
-    }
-
-    @SuppressWarnings("rawtypes")
-    private static List<Field<?>> createFields()
-            throws InstantiationException, IllegalAccessException {
-        List<Field<?>> fieldInstances = new ArrayList<Field<?>>();
-
-        for (Class<? extends Field> fieldType : VaadinClasses
-                .getFields()) {
-            fieldInstances.add(fieldType.newInstance());
-        }
-        return fieldInstances;
-    }
-
-}
diff --git a/server/src/test/java/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java b/server/src/test/java/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java
deleted file mode 100644
index 36057e935f..0000000000
--- a/server/src/test/java/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package com.vaadin.tests.server.components;
-
-import org.easymock.EasyMock;
-import org.junit.Test;
-
-import com.vaadin.v7.data.Property.ValueChangeEvent;
-import com.vaadin.v7.data.Property.ValueChangeListener;
-import com.vaadin.v7.data.Property.ValueChangeNotifier;
-import com.vaadin.v7.data.util.ObjectProperty;
-import com.vaadin.v7.ui.AbstractField;
-
-/**
- * Base class for tests for checking that value change listeners for fields are
- * not called exactly once when they should be, and not at other times.
- *
- * Does not check all cases (e.g. properties that do not implement
- * {@link ValueChangeNotifier}).
- *
- * Subclasses should implement {@link #setValue()} and call
- * <code>super.setValue(LegacyAbstractField)</code>. Also, subclasses should
- * typically override {@link #setValue(AbstractField)} to set the field
- * value via <code>changeVariables()</code>.
- */
-public abstract class AbstractFieldValueChangeTestBase<T> {
-
-    private AbstractField<T> field;
-    private ValueChangeListener listener;
-
-    protected void setUp(AbstractField<T> field) {
-        this.field = field;
-        listener = EasyMock.createStrictMock(ValueChangeListener.class);
-
-    }
-
-    protected ValueChangeListener getListener() {
-        return listener;
-    }
-
-    /**
-     * Test that listeners are not called when they have been unregistered.
-     */
-    @Test
-    public void testRemoveListener() {
-        getField().setPropertyDataSource(new ObjectProperty<String>(""));
-        getField().setBuffered(false);
-
-        // Expectations and start test
-        listener.valueChange(EasyMock.isA(ValueChangeEvent.class));
-        EasyMock.replay(listener);
-
-        // Add listener and set the value -> should end up in listener once
-        getField().addListener(listener);
-        setValue(getField());
-
-        // Ensure listener was called once
-        EasyMock.verify(listener);
-
-        // Remove the listener and set the value -> should not end up in
-        // listener
-        getField().removeListener(listener);
-        setValue(getField());
-
-        // Ensure listener still has been called only once
-        EasyMock.verify(listener);
-    }
-
-    /**
-     * Common unbuffered case: both writeThrough (auto-commit) and readThrough
-     * are on. Calling commit() should not cause notifications.
-     *
-     * Using the readThrough mode allows changes made to the property value to
-     * be seen in some cases also when there is no notification of value change
-     * from the property.
-     *
-     * LegacyField value change notifications closely mirror value changes of
-     * the data source behind the field.
-     */
-    @Test
-    public void testNonBuffered() {
-        getField().setPropertyDataSource(new ObjectProperty<String>(""));
-        getField().setBuffered(false);
-
-        expectValueChangeFromSetValueNotCommit();
-    }
-
-    /**
-     * Fully buffered use where the data source is neither read nor modified
-     * during editing, and is updated at commit().
-     *
-     * LegacyField value change notifications reflect the buffered value in the
-     * field, not the original data source value changes.
-     */
-    public void testBuffered() {
-        getField().setPropertyDataSource(new ObjectProperty<String>(""));
-        getField().setBuffered(true);
-
-        expectValueChangeFromSetValueNotCommit();
-    }
-
-    protected void expectValueChangeFromSetValueNotCommit() {
-        // Expectations and start test
-        listener.valueChange(EasyMock.isA(ValueChangeEvent.class));
-        EasyMock.replay(listener);
-
-        // Add listener and set the value -> should end up in listener once
-        getField().addListener(listener);
-        setValue(getField());
-
-        // Ensure listener was called once
-        EasyMock.verify(listener);
-
-        // commit
-        getField().commit();
-
-        // Ensure listener was not called again
-        EasyMock.verify(listener);
-    }
-
-    protected AbstractField<T> getField() {
-        return field;
-    }
-
-    /**
-     * Override in subclasses to set value with changeVariables().
-     */
-    protected void setValue(AbstractField<T> field) {
-        field.setValue((T) "newValue");
-    }
-
-}