1 files changed, 8 insertions, 8 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());
     }