diff options
Diffstat (limited to 'server/src/test')
16 files changed, 65 insertions, 64 deletions
diff --git a/server/src/test/java/com/vaadin/data/DefaultFieldGroupFieldFactoryTest.java b/server/src/test/java/com/vaadin/data/DefaultFieldGroupFieldFactoryTest.java index fc258ab138..1b019586e2 100644 --- a/server/src/test/java/com/vaadin/data/DefaultFieldGroupFieldFactoryTest.java +++ b/server/src/test/java/com/vaadin/data/DefaultFieldGroupFieldFactoryTest.java @@ -23,10 +23,10 @@ import org.junit.Before; import org.junit.Test; import com.vaadin.data.fieldgroup.DefaultFieldGroupFieldFactory; +import com.vaadin.legacy.ui.LegacyField; import com.vaadin.ui.AbstractSelect; import com.vaadin.ui.ComboBox; import com.vaadin.ui.DateField; -import com.vaadin.ui.Field; import com.vaadin.ui.InlineDateField; import com.vaadin.ui.ListSelect; import com.vaadin.ui.PopupDateField; @@ -66,28 +66,28 @@ public class DefaultFieldGroupFieldFactoryTest { @Test public void testDateGenerationForPopupDateField() { - Field f = fieldFactory.createField(Date.class, DateField.class); + LegacyField f = fieldFactory.createField(Date.class, DateField.class); Assert.assertNotNull(f); Assert.assertEquals(PopupDateField.class, f.getClass()); } @Test public void testDateGenerationForInlineDateField() { - Field f = fieldFactory.createField(Date.class, InlineDateField.class); + LegacyField f = fieldFactory.createField(Date.class, InlineDateField.class); Assert.assertNotNull(f); Assert.assertEquals(InlineDateField.class, f.getClass()); } @Test public void testDateGenerationForTextField() { - Field f = fieldFactory.createField(Date.class, TextField.class); + LegacyField f = fieldFactory.createField(Date.class, TextField.class); Assert.assertNotNull(f); Assert.assertEquals(TextField.class, f.getClass()); } @Test public void testDateGenerationForField() { - Field f = fieldFactory.createField(Date.class, Field.class); + LegacyField f = fieldFactory.createField(Date.class, LegacyField.class); Assert.assertNotNull(f); Assert.assertEquals(PopupDateField.class, f.getClass()); } @@ -98,14 +98,14 @@ public class DefaultFieldGroupFieldFactoryTest { @Test public void testEnumComboBox() { - Field f = fieldFactory.createField(SomeEnum.class, ComboBox.class); + LegacyField f = fieldFactory.createField(SomeEnum.class, ComboBox.class); Assert.assertNotNull(f); Assert.assertEquals(ComboBox.class, f.getClass()); } @Test public void testEnumAnySelect() { - Field f = fieldFactory + LegacyField f = fieldFactory .createField(SomeEnum.class, AbstractSelect.class); Assert.assertNotNull(f); Assert.assertEquals(ListSelect.class, f.getClass()); @@ -113,7 +113,7 @@ public class DefaultFieldGroupFieldFactoryTest { @Test public void testEnumAnyField() { - Field f = fieldFactory.createField(SomeEnum.class, Field.class); + LegacyField f = fieldFactory.createField(SomeEnum.class, LegacyField.class); Assert.assertNotNull(f); Assert.assertEquals(ListSelect.class, f.getClass()); } diff --git a/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupDateTest.java b/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupDateTest.java index ce76f8427b..919f4d3974 100644 --- a/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupDateTest.java +++ b/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupDateTest.java @@ -22,7 +22,7 @@ import org.junit.Before; import org.junit.Test; import com.vaadin.data.util.BeanItem; -import com.vaadin.ui.Field; +import com.vaadin.legacy.ui.LegacyField; import com.vaadin.ui.PopupDateField; public class FieldGroupDateTest { @@ -66,14 +66,14 @@ public class FieldGroupDateTest { @Test public void testBuildAndBindDate() { - Field f = fieldGroup.buildAndBind("javaDate"); + LegacyField f = fieldGroup.buildAndBind("javaDate"); Assert.assertNotNull(f); Assert.assertEquals(PopupDateField.class, f.getClass()); } @Test public void testBuildAndBindSqlDate() { - Field f = fieldGroup.buildAndBind("sqlDate"); + LegacyField f = fieldGroup.buildAndBind("sqlDate"); Assert.assertNotNull(f); Assert.assertEquals(PopupDateField.class, f.getClass()); } diff --git a/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupTest.java b/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupTest.java index f8e4d1c2d0..7e404e7b31 100644 --- a/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupTest.java +++ b/server/src/test/java/com/vaadin/data/fieldgroup/FieldGroupTest.java @@ -13,18 +13,18 @@ import com.vaadin.data.Property; import com.vaadin.data.Property.Transactional; import com.vaadin.data.util.BeanItem; import com.vaadin.data.util.TransactionalPropertyWrapper; -import com.vaadin.ui.Field; +import com.vaadin.legacy.ui.LegacyField; import com.vaadin.ui.TextField; public class FieldGroupTest { private FieldGroup sut; - private Field field; + private LegacyField field; @Before public void setup() { sut = new FieldGroup(); - field = mock(Field.class); + field = mock(LegacyField.class); } @Test @@ -37,7 +37,7 @@ public class FieldGroupTest { @Test(expected = FieldGroup.BindException.class) public void cannotBindToAlreadyBoundProperty() { sut.bind(field, "foobar"); - sut.bind(mock(Field.class), "foobar"); + sut.bind(mock(LegacyField.class), "foobar"); } @Test(expected = FieldGroup.BindException.class) diff --git a/server/src/test/java/com/vaadin/tests/VaadinClasses.java b/server/src/test/java/com/vaadin/tests/VaadinClasses.java index b5933bbd10..a8bb79af7a 100644 --- a/server/src/test/java/com/vaadin/tests/VaadinClasses.java +++ b/server/src/test/java/com/vaadin/tests/VaadinClasses.java @@ -17,12 +17,12 @@ import java.util.jar.JarEntry; import org.junit.Test; +import com.vaadin.legacy.ui.LegacyField; import com.vaadin.server.VaadinSession; import com.vaadin.ui.Component; import com.vaadin.ui.ComponentContainer; import com.vaadin.ui.CustomComponent; import com.vaadin.ui.DragAndDropWrapper; -import com.vaadin.ui.Field; import com.vaadin.ui.HorizontalSplitPanel; import com.vaadin.ui.LoginForm; import com.vaadin.ui.PopupView; @@ -63,9 +63,9 @@ public class VaadinClasses { } } - public static List<Class<? extends Field>> getFields() { + public static List<Class<? extends LegacyField>> getFields() { try { - return findClasses(Field.class, "com.vaadin.ui"); + return findClasses(LegacyField.class, "com.vaadin.ui"); } catch (IOException e) { e.printStackTrace(); return null; 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 index 32f5ef8850..89d73e98c5 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/FieldDefaultValuesTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/FieldDefaultValuesTest.java @@ -21,15 +21,15 @@ import java.util.List; import org.junit.Assert; import org.junit.Test; +import com.vaadin.legacy.ui.LegacyField; import com.vaadin.tests.VaadinClasses; -import com.vaadin.ui.Field; import com.vaadin.ui.Slider; public class FieldDefaultValuesTest { @Test public void testFieldsHaveDefaultValueAfterClear() throws Exception { - for (Field<?> field : createFields()) { + for (LegacyField<?> field : createFields()) { Object originalValue = field.getValue(); field.clear(); @@ -43,7 +43,7 @@ public class FieldDefaultValuesTest { @Test public void testFieldsAreEmptyAfterClear() throws Exception { - for (Field<?> field : createFields()) { + for (LegacyField<?> field : createFields()) { field.clear(); if (field instanceof Slider) { @@ -60,11 +60,11 @@ public class FieldDefaultValuesTest { } @SuppressWarnings("rawtypes") - private static List<Field<?>> createFields() throws InstantiationException, + private static List<LegacyField<?>> createFields() throws InstantiationException, IllegalAccessException { - List<Field<?>> fieldInstances = new ArrayList<Field<?>>(); + List<LegacyField<?>> fieldInstances = new ArrayList<LegacyField<?>>(); - for (Class<? extends Field> fieldType : VaadinClasses.getFields()) { + for (Class<? extends LegacyField> fieldType : VaadinClasses.getFields()) { fieldInstances.add(fieldType.newInstance()); } return fieldInstances; diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValidatorsTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValidatorsTest.java index 59831d92e1..a4fa3e0ad0 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValidatorsTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbsFieldValidatorsTest.java @@ -9,11 +9,11 @@ import org.easymock.EasyMock; import org.junit.Test; import com.vaadin.data.Validator; -import com.vaadin.ui.AbstractField; +import com.vaadin.legacy.ui.LegacyAbstractField; public class AbsFieldValidatorsTest { - AbstractField<Object> field = new AbstractField<Object>() { + LegacyAbstractField<Object> field = new LegacyAbstractField<Object>() { @Override public Class getType() { return Object.class; diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbstractFieldDeclarativeTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbstractFieldDeclarativeTest.java index 96ed8b6f1e..41ee1580eb 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbstractFieldDeclarativeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/AbstractFieldDeclarativeTest.java @@ -18,25 +18,25 @@ package com.vaadin.tests.server.component.abstractfield; import org.junit.Test; import com.vaadin.data.util.ObjectProperty; +import com.vaadin.legacy.ui.LegacyAbstractField; import com.vaadin.tests.design.DeclarativeTestBase; -import com.vaadin.ui.AbstractField; import com.vaadin.ui.TextField; /** - * Tests declarative support for implementations of {@link AbstractField}. + * Tests declarative support for implementations of {@link LegacyAbstractField}. * * @since 7.4 * @author Vaadin Ltd */ public class AbstractFieldDeclarativeTest extends - DeclarativeTestBase<AbstractField<?>> { + DeclarativeTestBase<LegacyAbstractField<?>> { @Test public void testPlainText() { String design = "<vaadin-text-field buffered validation-visible='false' invalid-committed" + " invalid-allowed='false' required required-error='This is a required field'" + " conversion-error='Input {0} cannot be parsed' tabindex=3 readonly/>"; - AbstractField tf = new TextField(); + LegacyAbstractField tf = new TextField(); tf.setBuffered(true); tf.setBuffered(true); tf.setValidationVisible(false); @@ -62,7 +62,7 @@ public class AbstractFieldDeclarativeTest extends // Test that read only value coming from property data source is not // written to design. String design = "<vaadin-text-field value=test></vaadin-text-field>"; - AbstractField component = new TextField(); + LegacyAbstractField component = new TextField(); ObjectProperty<String> property = new ObjectProperty<String>("test"); property.setReadOnly(true); component.setPropertyDataSource(property); diff --git a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetachTest.java b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetachTest.java index f547f2c66b..8bceffb729 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetachTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/abstractfield/RemoveListenersOnDetachTest.java @@ -7,10 +7,10 @@ import org.junit.Test; import com.vaadin.data.Property; import com.vaadin.data.util.AbstractProperty; import com.vaadin.data.util.converter.Converter.ConversionException; +import com.vaadin.legacy.ui.LegacyAbstractField; import com.vaadin.server.VaadinRequest; import com.vaadin.server.VaadinSession; import com.vaadin.tests.util.AlwaysLockedVaadinSession; -import com.vaadin.ui.AbstractField; import com.vaadin.ui.UI; public class RemoveListenersOnDetachTest { @@ -18,7 +18,7 @@ public class RemoveListenersOnDetachTest { int numValueChanges = 0; int numReadOnlyChanges = 0; - AbstractField field = new AbstractField() { + LegacyAbstractField field = new LegacyAbstractField() { final private VaadinSession application = new AlwaysLockedVaadinSession( null); private UI uI = new UI() { diff --git a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java index 90c079b35c..a710e1c529 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/BeanFieldGroupTest.java @@ -10,7 +10,7 @@ import com.vaadin.data.fieldgroup.BeanFieldGroup; import com.vaadin.data.fieldgroup.FieldGroup.CommitException; import com.vaadin.data.fieldgroup.PropertyId; import com.vaadin.data.util.BeanItem; -import com.vaadin.ui.Field; +import com.vaadin.legacy.ui.LegacyField; import com.vaadin.ui.RichTextArea; import com.vaadin.ui.TextField; @@ -87,12 +87,12 @@ public class BeanFieldGroupTest { BeanFieldGroup<MyBean> bindFields = BeanFieldGroup .bindFieldsUnbuffered(myBean, viewStub); - Field<String> field = (Field<String>) bindFields.getField("basicField"); + LegacyField<String> field = (LegacyField<String>) bindFields.getField("basicField"); Assert.assertEquals(DEFAULT_FOR_BASIC_FIELD, myBean.basicField); field.setValue("Foo"); Assert.assertEquals("Foo", myBean.basicField); - field = (Field<String>) bindFields.getField("anotherField"); + field = (LegacyField<String>) bindFields.getField("anotherField"); field.setValue("Foo"); Assert.assertEquals("Foo", myBean.anotherField); } @@ -106,12 +106,12 @@ public class BeanFieldGroupTest { BeanFieldGroup<MyBean> bindFields = BeanFieldGroup.bindFieldsBuffered( myBean, viewStub); - Field<String> basicField = (Field<String>) bindFields + LegacyField<String> basicField = (LegacyField<String>) bindFields .getField("basicField"); basicField.setValue("Foo"); Assert.assertEquals(DEFAULT_FOR_BASIC_FIELD, myBean.basicField); - Field<String> anotherField = (Field<String>) bindFields + LegacyField<String> anotherField = (LegacyField<String>) bindFields .getField("anotherField"); anotherField.setValue("Foo"); Assert.assertNull(myBean.anotherField); @@ -131,7 +131,7 @@ public class BeanFieldGroupTest { BeanFieldGroup<MyBean> bfg = new BeanFieldGroup<MyBean>(MyBean.class); bfg.setItemDataSource(bean); - com.vaadin.ui.Field<?> helloField = bfg.buildAndBind("Hello string", + com.vaadin.legacy.ui.LegacyField<?> helloField = bfg.buildAndBind("Hello string", "nestedBean.hello"); assertEquals(bean.nestedBean.hello, helloField.getValue().toString()); } diff --git a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java index d77a2e190b..3f98efb15d 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/fieldgroup/FieldGroupTest.java @@ -31,7 +31,7 @@ import com.vaadin.data.Validator.InvalidValueException; import com.vaadin.data.fieldgroup.FieldGroup; import com.vaadin.data.fieldgroup.FieldGroup.CommitException; import com.vaadin.data.util.AbstractProperty; -import com.vaadin.ui.Field; +import com.vaadin.legacy.ui.LegacyField; import com.vaadin.ui.TextField; /** @@ -81,16 +81,16 @@ public class FieldGroupTest { field2.setRequired(true); fieldGroup.bind(field2, "prop2"); - Set<TextField> set = new HashSet<TextField>(Arrays.asList(field1, + Set<TextField> set = new HashSet<>(Arrays.asList(field1, field2)); try { fieldGroup.commit(); Assert.fail("No commit exception is thrown"); } catch (CommitException exception) { - Map<Field<?>, ? extends InvalidValueException> invalidFields = exception + Map<LegacyField<?>, ? extends InvalidValueException> invalidFields = exception .getInvalidFields(); - for (Entry<Field<?>, ? extends InvalidValueException> entry : invalidFields + for (Entry<LegacyField<?>, ? extends InvalidValueException> entry : invalidFields .entrySet()) { set.remove(entry.getKey()); } @@ -137,7 +137,8 @@ public class FieldGroupTest { } @Override - public void setValue(String newValue) throws Property.ReadOnlyException { + public void setValue(String newValue) + throws Property.ReadOnlyException { } @Override diff --git a/server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java b/server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java index b70f17779a..5a019f702d 100644 --- a/server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java +++ b/server/src/test/java/com/vaadin/tests/server/component/grid/GridEditorTest.java @@ -35,10 +35,10 @@ import com.vaadin.data.Property; import com.vaadin.data.fieldgroup.FieldGroup; import com.vaadin.data.fieldgroup.FieldGroup.CommitException; import com.vaadin.data.util.IndexedContainer; +import com.vaadin.legacy.ui.LegacyField; import com.vaadin.server.MockVaadinSession; import com.vaadin.server.VaadinService; import com.vaadin.server.VaadinSession; -import com.vaadin.ui.Field; import com.vaadin.ui.Grid; import com.vaadin.ui.TextField; @@ -235,7 +235,7 @@ public class GridEditorTest { public void testFieldIsNotReadonly() { startEdit(); - Field<?> field = grid.getColumn(PROPERTY_NAME).getEditorField(); + LegacyField<?> field = grid.getColumn(PROPERTY_NAME).getEditorField(); assertFalse(field.isReadOnly()); } @@ -244,13 +244,13 @@ public class GridEditorTest { startEdit(); grid.getEditorFieldGroup().setReadOnly(true); - Field<?> field = grid.getColumn(PROPERTY_NAME).getEditorField(); + LegacyField<?> field = grid.getColumn(PROPERTY_NAME).getEditorField(); assertTrue(field.isReadOnly()); } @Test public void testColumnRemoved() { - Field<?> field = grid.getColumn(PROPERTY_NAME).getEditorField(); + LegacyField<?> field = grid.getColumn(PROPERTY_NAME).getEditorField(); assertSame("field should be attached to ", grid, field.getParent()); 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 index d068051663..9e71150946 100644 --- a/server/src/test/java/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java +++ b/server/src/test/java/com/vaadin/tests/server/components/AbstractFieldValueChangeTestBase.java @@ -7,7 +7,7 @@ import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.Property.ValueChangeListener; import com.vaadin.data.Property.ValueChangeNotifier; import com.vaadin.data.util.ObjectProperty; -import com.vaadin.ui.AbstractField; +import com.vaadin.legacy.ui.LegacyAbstractField; /** * Base class for tests for checking that value change listeners for fields are @@ -17,16 +17,16 @@ import com.vaadin.ui.AbstractField; * {@link ValueChangeNotifier}). * * Subclasses should implement {@link #setValue()} and call - * <code>super.setValue(AbstractField)</code>. Also, subclasses should typically - * override {@link #setValue(AbstractField)} to set the field value via + * <code>super.setValue(LegacyAbstractField)</code>. Also, subclasses should typically + * override {@link #setValue(LegacyAbstractField)} to set the field value via * <code>changeVariables()</code>. */ public abstract class AbstractFieldValueChangeTestBase<T> { - private AbstractField<T> field; + private LegacyAbstractField<T> field; private ValueChangeListener listener; - protected void setUp(AbstractField<T> field) { + protected void setUp(LegacyAbstractField<T> field) { this.field = field; listener = EasyMock.createStrictMock(ValueChangeListener.class); @@ -72,7 +72,7 @@ public abstract class AbstractFieldValueChangeTestBase<T> { * be seen in some cases also when there is no notification of value change * from the property. * - * Field value change notifications closely mirror value changes of the data + * LegacyField value change notifications closely mirror value changes of the data * source behind the field. */ @Test @@ -87,7 +87,7 @@ public abstract class AbstractFieldValueChangeTestBase<T> { * Fully buffered use where the data source is neither read nor modified * during editing, and is updated at commit(). * - * Field value change notifications reflect the buffered value in the field, + * LegacyField value change notifications reflect the buffered value in the field, * not the original data source value changes. */ public void testBuffered() { @@ -116,14 +116,14 @@ public abstract class AbstractFieldValueChangeTestBase<T> { EasyMock.verify(listener); } - protected AbstractField<T> getField() { + protected LegacyAbstractField<T> getField() { return field; } /** * Override in subclasses to set value with changeVariables(). */ - protected void setValue(AbstractField<T> field) { + protected void setValue(LegacyAbstractField<T> field) { field.setValue((T) "newValue"); } diff --git a/server/src/test/java/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java b/server/src/test/java/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java index 8bc1eb87df..9d8901e129 100644 --- a/server/src/test/java/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/components/ComboBoxValueChangeTest.java @@ -5,7 +5,7 @@ import java.util.Map; import org.junit.Before; -import com.vaadin.ui.AbstractField; +import com.vaadin.legacy.ui.LegacyAbstractField; import com.vaadin.ui.ComboBox; /** @@ -25,7 +25,7 @@ public class ComboBoxValueChangeTest extends } @Override - protected void setValue(AbstractField<Object> field) { + protected void setValue(LegacyAbstractField<Object> field) { Map<String, Object> variables = new HashMap<String, Object>(); variables.put("selected", new String[] { "myvalue" }); ((ComboBox) field).changeVariables(field, variables); diff --git a/server/src/test/java/com/vaadin/tests/server/components/TextFieldValueChangeTest.java b/server/src/test/java/com/vaadin/tests/server/components/TextFieldValueChangeTest.java index 3b34d17c99..0ce07f8fb3 100644 --- a/server/src/test/java/com/vaadin/tests/server/components/TextFieldValueChangeTest.java +++ b/server/src/test/java/com/vaadin/tests/server/components/TextFieldValueChangeTest.java @@ -10,7 +10,7 @@ import org.junit.Test; import com.vaadin.data.Property.ValueChangeEvent; import com.vaadin.data.util.ObjectProperty; -import com.vaadin.ui.AbstractField; +import com.vaadin.legacy.ui.LegacyAbstractField; import com.vaadin.ui.TextField; /** @@ -39,7 +39,7 @@ public class TextFieldValueChangeTest extends } @Override - protected void setValue(AbstractField<String> field) { + protected void setValue(LegacyAbstractField<String> field) { Map<String, Object> variables = new HashMap<String, Object>(); variables.put("text", "newValue"); ((TextField) field).changeVariables(field, variables); diff --git a/server/src/test/java/com/vaadin/tests/server/validation/BeanValidationTest.java b/server/src/test/java/com/vaadin/tests/server/validation/BeanValidationTest.java index 6ad6ac2d5f..70a6a4487c 100644 --- a/server/src/test/java/com/vaadin/tests/server/validation/BeanValidationTest.java +++ b/server/src/test/java/com/vaadin/tests/server/validation/BeanValidationTest.java @@ -6,8 +6,8 @@ import org.junit.Test; import com.vaadin.data.Validator.InvalidValueException; import com.vaadin.data.fieldgroup.BeanFieldGroup; import com.vaadin.data.validator.BeanValidator; +import com.vaadin.legacy.ui.LegacyField; import com.vaadin.tests.data.bean.BeanToValidate; -import com.vaadin.ui.Field; public class BeanValidationTest { @Test(expected = InvalidValueException.class) @@ -95,7 +95,7 @@ public class BeanValidationTest { beanToValidate.setFirstname("a"); fieldGroup.setItemDataSource(beanToValidate); - Field<?> nameField = fieldGroup.buildAndBind("firstname"); + LegacyField<?> nameField = fieldGroup.buildAndBind("firstname"); Assert.assertEquals(1, nameField.getValidators().size()); try { diff --git a/server/src/test/java/com/vaadin/util/ReflectToolsGetFieldValueByTypeTest.java b/server/src/test/java/com/vaadin/util/ReflectToolsGetFieldValueByTypeTest.java index 67796314c0..c3b09428d4 100644 --- a/server/src/test/java/com/vaadin/util/ReflectToolsGetFieldValueByTypeTest.java +++ b/server/src/test/java/com/vaadin/util/ReflectToolsGetFieldValueByTypeTest.java @@ -28,7 +28,7 @@ public class ReflectToolsGetFieldValueByTypeTest { try { memberField = myInstance.getClass().getField("field"); // Should get a String value. Without the third parameter (calling - // ReflectTools.getJavaFieldValue(Object object, Field field)) would + // ReflectTools.getJavaFieldValue(Object object, LegacyField field)) would // get an Integer value fieldValue = ReflectTools.getJavaFieldValue(myInstance, memberField, String.class); |