Rename AbstractFieldTest to LegacyAbstractFieldTest

Change-Id: I6cc419884ecba7f75e825ddcba343325b2d77f1b

10 files changed, 34 insertions, 29 deletions

diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java
index 1f407c710f..6e2920cf63 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractTextFieldTest.java
@@ -10,7 +10,7 @@ import com.vaadin.ui.AbstractTextField;
 import com.vaadin.ui.AbstractTextField.TextChangeEventMode;
 
 public abstract class AbstractTextFieldTest<T extends AbstractTextField>
-        extends AbstractFieldTest<T> implements TextChangeListener {
+        extends LegacyAbstractFieldTest<T> implements TextChangeListener {
 
     private Command<T, Integer> maxlengthCommand = new Command<T, Integer>() {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractFieldTest.java
index fb4913d71e..795465bb88 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractFieldTest.java
@@ -18,9 +18,9 @@ import com.vaadin.tests.components.AbstractComponentTest;
 import com.vaadin.ui.MenuBar;
 import com.vaadin.ui.MenuBar.MenuItem;
 
-public abstract class AbstractFieldTest<T extends LegacyAbstractField> extends
-        AbstractComponentTest<T> implements ValueChangeListener,
-        ReadOnlyStatusChangeListener {
+public abstract class LegacyAbstractFieldTest<T extends LegacyAbstractField>
+        extends AbstractComponentTest<T>
+        implements ValueChangeListener, ReadOnlyStatusChangeListener {
 
     private boolean sortValueChanges = true;
 
@@ -54,8 +54,8 @@ public abstract class AbstractFieldTest<T extends LegacyAbstractField> extends
         super.populateSettingsMenu(settingsMenu);
 
         if (LegacyAbstractField.class.isAssignableFrom(getTestClass())) {
-            MenuItem abstractField = settingsMenu
-                    .addItem("LegacyAbstractField", null);
+            MenuItem abstractField = settingsMenu.addItem("LegacyAbstractField",
+                    null);
             abstractField.addItem("Show value", new MenuBar.Command() {
 
                 @Override
@@ -101,8 +101,8 @@ public abstract class AbstractFieldTest<T extends LegacyAbstractField> extends
 
     private void createReadOnlyStatusChangeListener(String category) {
 
-        createBooleanAction("Read only status change listener", category,
-                false, readonlyStatusChangeListenerCommand);
+        createBooleanAction("Read only status change listener", category, false,
+                readonlyStatusChangeListenerCommand);
     }
 
     protected Command<T, Boolean> valueChangeListenerCommand = new Command<T, Boolean>() {
@@ -110,9 +110,11 @@ public abstract class AbstractFieldTest<T extends LegacyAbstractField> extends
         @Override
         public void execute(T c, Boolean value, Object data) {
             if (value) {
-                c.addListener((ValueChangeListener) AbstractFieldTest.this);
+                c.addListener(
+                        (ValueChangeListener) LegacyAbstractFieldTest.this);
             } else {
-                c.removeListener((ValueChangeListener) AbstractFieldTest.this);
+                c.removeListener(
+                        (ValueChangeListener) LegacyAbstractFieldTest.this);
             }
         }
     };
@@ -121,9 +123,11 @@ public abstract class AbstractFieldTest<T extends LegacyAbstractField> extends
         @Override
         public void execute(T c, Boolean value, Object data) {
             if (value) {
-                c.addListener((ReadOnlyStatusChangeListener) AbstractFieldTest.this);
+                c.addListener(
+                        (ReadOnlyStatusChangeListener) LegacyAbstractFieldTest.this);
             } else {
-                c.removeListener((ReadOnlyStatusChangeListener) AbstractFieldTest.this);
+                c.removeListener(
+                        (ReadOnlyStatusChangeListener) LegacyAbstractFieldTest.this);
             }
         }
     };
@@ -189,7 +193,8 @@ public abstract class AbstractFieldTest<T extends LegacyAbstractField> extends
         List<String> values = new ArrayList<String>();
         values.add("Test");
         values.add("A little longer value");
-        values.add("A very long value with very much text. All in all it is 74 characters long");
+        values.add(
+                "A very long value with very much text. All in all it is 74 characters long");
 
         createClickAction("(empty string)", subCategory, setValueCommand, "");
         createClickAction("(null)", subCategory, setValueCommand, null);
diff --git a/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxes2.java b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxes2.java
index 6734c752de..8ef8811445 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxes2.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/checkbox/CheckBoxes2.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.components.checkbox;
 
-import com.vaadin.tests.components.abstractfield.AbstractFieldTest;
+import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Button.ClickListener;
 import com.vaadin.ui.CheckBox;
 
-public class CheckBoxes2 extends AbstractFieldTest<CheckBox> implements
+public class CheckBoxes2 extends LegacyAbstractFieldTest<CheckBox> implements
         ClickListener {
 
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTest.java
index 10718cae8b..f7c98e77e8 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/datefield/DateFieldTest.java
@@ -8,10 +8,10 @@ import java.util.LinkedHashMap;
 import java.util.Locale;
 
 import com.vaadin.shared.ui.datefield.Resolution;
-import com.vaadin.tests.components.abstractfield.AbstractFieldTest;
+import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest;
 import com.vaadin.ui.DateField;
 
-public class DateFieldTest<T extends DateField> extends AbstractFieldTest<T> {
+public class DateFieldTest<T extends DateField> extends LegacyAbstractFieldTest<T> {
 
     @SuppressWarnings("unchecked")
     @Override
diff --git a/uitest/src/main/java/com/vaadin/tests/components/form/FormTest.java b/uitest/src/main/java/com/vaadin/tests/components/form/FormTest.java
index f1538ef15b..57ae2128d3 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/form/FormTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/form/FormTest.java
@@ -6,7 +6,7 @@ import com.vaadin.data.Item;
 import com.vaadin.data.util.BeanItem;
 import com.vaadin.legacy.ui.LegacyField;
 import com.vaadin.shared.ui.AlignmentInfo;
-import com.vaadin.tests.components.abstractfield.AbstractFieldTest;
+import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest;
 import com.vaadin.tests.components.select.AbstractSelectTestCase;
 import com.vaadin.tests.util.Person;
 import com.vaadin.tests.util.Product;
@@ -26,7 +26,7 @@ import com.vaadin.ui.Layout.AlignmentHandler;
 import com.vaadin.ui.TextField;
 import com.vaadin.ui.VerticalLayout;
 
-public class FormTest extends AbstractFieldTest<Form> {
+public class FormTest extends LegacyAbstractFieldTest<Form> {
 
     private Command<Form, String> footerWidthCommand = new Command<Form, String>() {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarGenericTest.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarGenericTest.java
index 79797c60a2..c98f580ae2 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarGenericTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressBarGenericTest.java
@@ -2,10 +2,10 @@ package com.vaadin.tests.components.progressindicator;
 
 import java.util.LinkedHashMap;
 
-import com.vaadin.tests.components.abstractfield.AbstractFieldTest;
+import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest;
 import com.vaadin.ui.ProgressBar;
 
-public class ProgressBarGenericTest extends AbstractFieldTest<ProgressBar> {
+public class ProgressBarGenericTest extends LegacyAbstractFieldTest<ProgressBar> {
 
     private Command<ProgressBar, Boolean> indeterminate = new Command<ProgressBar, Boolean>() {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorTest.java b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorTest.java
index 5b3a931e5b..3590881efa 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/progressindicator/ProgressIndicatorTest.java
@@ -17,10 +17,10 @@ package com.vaadin.tests.components.progressindicator;
 
 import java.util.LinkedHashMap;
 
-import com.vaadin.tests.components.abstractfield.AbstractFieldTest;
+import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest;
 import com.vaadin.ui.ProgressIndicator;
 
-public class ProgressIndicatorTest extends AbstractFieldTest<ProgressIndicator> {
+public class ProgressIndicatorTest extends LegacyAbstractFieldTest<ProgressIndicator> {
     ProgressIndicator progress = new ProgressIndicator();
     Command<ProgressIndicator, Float> setValueCommand = new Command<ProgressIndicator, Float>() {
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java
index 4155dd8a07..72361ca82a 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/richtextarea/RichTextAreaTest.java
@@ -2,10 +2,10 @@ package com.vaadin.tests.components.richtextarea;
 
 import java.util.LinkedHashMap;
 
-import com.vaadin.tests.components.abstractfield.AbstractFieldTest;
+import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest;
 import com.vaadin.ui.RichTextArea;
 
-public class RichTextAreaTest extends AbstractFieldTest<RichTextArea> {
+public class RichTextAreaTest extends LegacyAbstractFieldTest<RichTextArea> {
 
     @Override
     protected Class<RichTextArea> getTestClass() {
diff --git a/uitest/src/main/java/com/vaadin/tests/components/select/AbstractSelectTestCase.java b/uitest/src/main/java/com/vaadin/tests/components/select/AbstractSelectTestCase.java
index b0c6c08a62..c406dcd749 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/select/AbstractSelectTestCase.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/select/AbstractSelectTestCase.java
@@ -12,11 +12,11 @@ import com.vaadin.event.ItemClickEvent;
 import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.event.ItemClickEvent.ItemClickNotifier;
 import com.vaadin.server.Resource;
-import com.vaadin.tests.components.abstractfield.AbstractFieldTest;
+import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest;
 import com.vaadin.ui.AbstractSelect;
 
 public abstract class AbstractSelectTestCase<T extends AbstractSelect> extends
-        AbstractFieldTest<T> implements ItemClickListener {
+        LegacyAbstractFieldTest<T> implements ItemClickListener {
 
     public static final String CATEGORY_DATA_SOURCE = "Data source";
 
diff --git a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderTest.java b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderTest.java
index 0b9c2d6c5a..d8576518f7 100644
--- a/uitest/src/main/java/com/vaadin/tests/components/slider/SliderTest.java
+++ b/uitest/src/main/java/com/vaadin/tests/components/slider/SliderTest.java
@@ -3,10 +3,10 @@ package com.vaadin.tests.components.slider;
 import java.util.LinkedHashMap;
 
 import com.vaadin.shared.ui.slider.SliderOrientation;
-import com.vaadin.tests.components.abstractfield.AbstractFieldTest;
+import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest;
 import com.vaadin.ui.Slider;
 
-public class SliderTest extends AbstractFieldTest<Slider> {
+public class SliderTest extends LegacyAbstractFieldTest<Slider> {
 
     private Command<Slider, Double> minCommand = new Command<Slider, Double>() {
         @Override