From 58853fe47bb01a0c0c2b5c380056d22ccccd6f08 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Thu, 25 Aug 2016 13:21:36 +0300
Subject: Move old TextField to compatibility package

Change-Id: Ic1e8d3f9859f5e496c0e27e2fece4b5a9da74f01
---
 .../abstractfield/LegacyAbstractTextFieldTest.java | 256 ---------------------
 .../passwordfield/PasswordFieldTest.java           |  21 --
 .../textarea/TextAreaCursorPosition.java           |  49 ----
 .../tests/components/textarea/TextAreaTest.java    |  45 ----
 .../components/textfield/TextChangeEvents.java     | 146 ------------
 .../components/textfield/TextChangeEvents2.java    | 189 ---------------
 .../textfield/TextChangeEventsEternalLoop.java     |  26 ---
 ...extChangeEventsWithNonImmediateValueChange.java |  57 -----
 ...extChangeListenerChangingNonTextProperties.java |  52 -----
 .../textfield/TextChangeListenerLosesFocus.java    |  70 ------
 .../textfield/TextChangeTimeoutAfterDetach.java    |  50 ----
 .../textfield/TextFieldEagerRepaint.java           |  55 -----
 .../tests/components/textfield/TextFieldTest.java  |  20 --
 .../passwordfield/PasswordFieldTest.java           |  21 ++
 .../textarea/TextAreaCursorPosition.java           |  49 ++++
 .../v7/tests/components/textarea/TextAreaTest.java |  45 ++++
 .../textfield/AbstractTextFieldTest.java           | 255 ++++++++++++++++++++
 .../components/textfield/TextChangeEvents.java     | 146 ++++++++++++
 .../components/textfield/TextChangeEvents2.java    | 189 +++++++++++++++
 .../textfield/TextChangeEventsEternalLoop.java     |  26 +++
 ...extChangeEventsWithNonImmediateValueChange.java |  57 +++++
 ...extChangeListenerChangingNonTextProperties.java |  52 +++++
 .../textfield/TextChangeListenerLosesFocus.java    |  70 ++++++
 .../textfield/TextChangeTimeoutAfterDetach.java    |  50 ++++
 .../textfield/TextFieldEagerRepaint.java           |  55 +++++
 .../tests/components/textfield/TextFieldTest.java  |  19 ++
 26 files changed, 1034 insertions(+), 1036 deletions(-)
 delete mode 100644 uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractTextFieldTest.java
 delete mode 100644 uitest/src/main/java/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java
 delete mode 100644 uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java
 delete mode 100644 uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaTest.java
 delete mode 100644 uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents.java
 delete mode 100644 uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java
 delete mode 100644 uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java
 delete mode 100644 uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
 delete mode 100644 uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
 delete mode 100644 uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerLosesFocus.java
 delete mode 100644 uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java
 delete mode 100644 uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java
 delete mode 100644 uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTest.java
 create mode 100644 uitest/src/main/java/com/vaadin/v7/tests/components/passwordfield/PasswordFieldTest.java
 create mode 100644 uitest/src/main/java/com/vaadin/v7/tests/components/textarea/TextAreaCursorPosition.java
 create mode 100644 uitest/src/main/java/com/vaadin/v7/tests/components/textarea/TextAreaTest.java
 create mode 100644 uitest/src/main/java/com/vaadin/v7/tests/components/textfield/AbstractTextFieldTest.java
 create mode 100644 uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEvents.java
 create mode 100644 uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEvents2.java
 create mode 100644 uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEventsEternalLoop.java
 create mode 100644 uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
 create mode 100644 uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
 create mode 100644 uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeListenerLosesFocus.java
 create mode 100644 uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeTimeoutAfterDetach.java
 create mode 100644 uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextFieldEagerRepaint.java
 create mode 100644 uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextFieldTest.java

(limited to 'uitest')

diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractTextFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractTextFieldTest.java
deleted file mode 100644
index 71ed46eb66..0000000000
--- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractTextFieldTest.java
+++ /dev/null
@@ -1,256 +0,0 @@
-package com.vaadin.tests.components.abstractfield;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-
-import com.vaadin.event.FieldEvents.TextChangeEvent;
-import com.vaadin.event.FieldEvents.TextChangeListener;
-import com.vaadin.v7.ui.AbstractTextField;
-import com.vaadin.v7.ui.AbstractTextField.TextChangeEventMode;
-
-public abstract class LegacyAbstractTextFieldTest<T extends AbstractTextField>
-        extends LegacyAbstractFieldTest<T> implements TextChangeListener {
-
-    private Command<T, Integer> maxlengthCommand = new Command<T, Integer>() {
-
-        @Override
-        public void execute(T c, Integer value, Object data) {
-            c.setMaxLength(value);
-        }
-    };
-    private Command<T, Boolean> nullSelectionAllowedCommand = new Command<T, Boolean>() {
-
-        @Override
-        public void execute(T c, Boolean value, Object data) {
-            c.setNullSettingAllowed(value);
-
-        }
-    };
-    private Command<T, String> nullRepresentationCommand = new Command<T, String>() {
-
-        @Override
-        public void execute(T c, String value, Object data) {
-            c.setNullRepresentation(value);
-        }
-    };
-
-    private Command<T, String> inputPromptCommand = new Command<T, String>() {
-        @Override
-        public void execute(T c, String value, Object data) {
-            c.setInputPrompt(value);
-        }
-    };
-
-    private Command<T, Boolean> textChangeListenerCommand = new Command<T, Boolean>() {
-        @Override
-        public void execute(T c, Boolean value, Object data) {
-            if (value) {
-                c.addListener(
-                        (TextChangeListener) LegacyAbstractTextFieldTest.this);
-            } else {
-                c.removeListener(
-                        (TextChangeListener) LegacyAbstractTextFieldTest.this);
-            }
-        }
-    };
-
-    private Command<T, Integer> colsCommand = new Command<T, Integer>() {
-        @Override
-        public void execute(T c, Integer value, Object data) {
-            c.setColumns(value);
-        }
-    };
-
-    private Command<T, TextChangeEventMode> textChangeEventModeCommand = new Command<T, TextChangeEventMode>() {
-        @Override
-        public void execute(T c, TextChangeEventMode value, Object data) {
-            c.setTextChangeEventMode(value);
-        }
-    };
-
-    private Command<T, Integer> textChangeTimeoutCommand = new Command<T, Integer>() {
-        @Override
-        public void execute(T c, Integer value, Object data) {
-            c.setTextChangeTimeout(value);
-        }
-    };
-
-    private Command<T, Range> selectionRangeCommand = new Command<T, Range>() {
-        @Override
-        public void execute(T c, Range value, Object data) {
-            c.setSelectionRange(value.getStart(),
-                    value.getEnd() - value.getStart());
-
-        }
-    };
-    private Command<T, Object> selectAllCommand = new Command<T, Object>() {
-        @Override
-        public void execute(T c, Object value, Object data) {
-            c.selectAll();
-        }
-    };
-
-    private Command<T, Integer> setCursorPositionCommand = new Command<T, Integer>() {
-
-        @Override
-        public void execute(T c, Integer value, Object data) {
-            c.setCursorPosition(value);
-        }
-    };
-
-    @Override
-    protected void createActions() {
-        super.createActions();
-
-        createSetTextValueAction(CATEGORY_ACTIONS);
-
-        createNullSettingAllowedAction(CATEGORY_FEATURES);
-        createNullRepresentationAction(CATEGORY_FEATURES);
-        createMaxLengthAction(CATEGORY_FEATURES);
-
-        createInputPromptAction(CATEGORY_FEATURES);
-        createColsAction(CATEGORY_STATE);
-
-        createTextChangeListener(CATEGORY_LISTENERS);
-        createTextChangeEventModeAction(CATEGORY_FEATURES);
-        createTextChangeEventTimeoutAction(CATEGORY_FEATURES);
-
-        createSetTextValueAction(CATEGORY_ACTIONS);
-        createCursorPositionAction(CATEGORY_ACTIONS);
-        createSelectionRangeAction(CATEGORY_ACTIONS);
-
-    }
-
-    private void createNullSettingAllowedAction(String category) {
-        createBooleanAction("Null selection allowed", category, true,
-                nullSelectionAllowedCommand);
-    }
-
-    private void createNullRepresentationAction(String category) {
-        LinkedHashMap<String, String> options = new LinkedHashMap<String, String>();
-        options.put("-", null);
-        options.put("null", "null");
-        options.put("This is empty", "This is empty");
-        options.put("- Nothing -", "- Nothing -");
-        createSelectAction("Null representation", category, options, "null",
-                nullRepresentationCommand);
-    }
-
-    private void createMaxLengthAction(String category) {
-        LinkedHashMap<String, Integer> options = createIntegerOptions(100);
-        options.put("-", -1);
-        createSelectAction("Max length", category, options, "-",
-                maxlengthCommand);
-
-    }
-
-    public class Range {
-        private int start;
-        private int end;
-
-        public Range(int start, int end) {
-            this.start = start;
-            this.end = end;
-        }
-
-        public int getStart() {
-            return start;
-        }
-
-        public int getEnd() {
-            return end;
-        }
-
-        @Override
-        public String toString() {
-            return start + "-" + end;
-        }
-    }
-
-    private void createSelectionRangeAction(String category) {
-        List<Range> options = new ArrayList<Range>();
-        options.add(new Range(0, 10));
-        options.add(new Range(0, 1));
-        options.add(new Range(0, 2));
-        options.add(new Range(1, 2));
-        options.add(new Range(2, 5));
-        options.add(new Range(5, 10));
-
-        createCategory("Select range", category);
-
-        createClickAction("All", "Select range", selectAllCommand, null);
-        for (Range range : options) {
-            createClickAction(range.toString(), "Select range",
-                    selectionRangeCommand, range);
-        }
-
-    }
-
-    private void createCursorPositionAction(String category) {
-        String subCategory = "Set cursor position";
-        createCategory(subCategory, category);
-        for (int i = 0; i < 20; i++) {
-            createClickAction(String.valueOf(i), subCategory,
-                    setCursorPositionCommand, Integer.valueOf(i));
-        }
-
-    }
-
-    private void createTextChangeEventTimeoutAction(String category) {
-        LinkedHashMap<String, Integer> options = new LinkedHashMap<String, Integer>();
-        options.put("0", 0);
-        options.put("100ms", 100);
-        options.put("500ms", 500);
-        options.put("1s", 1000);
-        options.put("2s", 2000);
-        options.put("5s", 5000);
-
-        createSelectAction("TextChange timeout", category, options, "0",
-                textChangeTimeoutCommand);
-    }
-
-    private void createTextChangeEventModeAction(String category) {
-        LinkedHashMap<String, TextChangeEventMode> options = new LinkedHashMap<String, AbstractTextField.TextChangeEventMode>();
-        for (TextChangeEventMode m : TextChangeEventMode.values()) {
-            options.put(m.toString(), m);
-        }
-
-        createSelectAction("TextChange event mode", category, options,
-                TextChangeEventMode.EAGER.toString(),
-                textChangeEventModeCommand);
-
-    }
-
-    private void createTextChangeListener(String category) {
-        createBooleanAction("Text change listener", category, false,
-                textChangeListenerCommand);
-
-    }
-
-    private void createColsAction(String category) {
-        LinkedHashMap<String, Integer> options = createIntegerOptions(20);
-        createSelectAction("Columns", category, options, "0", colsCommand);
-    }
-
-    private void createInputPromptAction(String category) {
-        LinkedHashMap<String, String> options = new LinkedHashMap<String, String>();
-        options.put("-", null);
-        options.put("Enter a value", "Enter a value");
-        options.put("- Click here -", "- Click here -");
-        createSelectAction("Input prompt", category, options, "-",
-                inputPromptCommand);
-
-    }
-
-    @Override
-    public void textChange(TextChangeEvent event) {
-        AbstractTextField tf = (AbstractTextField) event
-                .getComponent();
-        log("TextChangeEvent: text='" + event.getText() + "', cursor position="
-                + event.getCursorPosition() + " (field cursor pos: "
-                + tf.getCursorPosition() + ")");
-
-    }
-
-}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java
deleted file mode 100644
index 15933e1060..0000000000
--- a/uitest/src/main/java/com/vaadin/tests/components/passwordfield/PasswordFieldTest.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.vaadin.tests.components.passwordfield;
-
-import com.vaadin.event.FieldEvents.TextChangeListener;
-import com.vaadin.tests.components.abstractfield.LegacyAbstractTextFieldTest;
-import com.vaadin.v7.ui.PasswordField;
-
-public class PasswordFieldTest
-        extends LegacyAbstractTextFieldTest<PasswordField>
-        implements TextChangeListener {
-
-    @Override
-    protected Class<PasswordField> getTestClass() {
-        return PasswordField.class;
-    }
-
-    @Override
-    protected void createActions() {
-        super.createActions();
-    }
-
-}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java
deleted file mode 100644
index 9eeab8905e..0000000000
--- a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaCursorPosition.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.vaadin.tests.components.textarea;
-
-import com.vaadin.shared.ui.textfield.ValueChangeMode;
-import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.AbstractField;
-import com.vaadin.ui.AbstractTextField;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.Label;
-import com.vaadin.ui.TextArea;
-import com.vaadin.ui.TextField;
-
-public class TextAreaCursorPosition extends TestBase {
-
-    private TextField cursorPosition = new TextField("Cursor position");
-
-    @Override
-    public void setup() {
-        Label label = new Label(
-                "Test of calculation of cursor position of TextArea");
-        TextArea textArea = new TextArea();
-        addListener(textArea);
-        addComponent(label);
-        addComponent(textArea);
-        addComponent(cursorPosition);
-        cursorPosition.setValue("?");
-        addComponent(new Button("Force position update"));
-    }
-
-    public void addListener(AbstractField newField) {
-        AbstractTextField newTextField = (AbstractTextField) newField;
-        newTextField.setValueChangeMode(ValueChangeMode.EAGER);
-        newTextField.addValueChangeListener(event -> {
-            AbstractTextField component = (AbstractTextField) event.getSource();
-            cursorPosition
-                    .setValue(String.valueOf(component.getCursorPosition()));
-        });
-    }
-
-    @Override
-    protected String getDescription() {
-        return "Writing something in the field updates the cursor position field. The position field can also be updated using the button.";
-    }
-
-    @Override
-    protected Integer getTicketNumber() {
-        return 7726;
-    }
-
-}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaTest.java b/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaTest.java
deleted file mode 100644
index 74a6e3a4d9..0000000000
--- a/uitest/src/main/java/com/vaadin/tests/components/textarea/TextAreaTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package com.vaadin.tests.components.textarea;
-
-import java.util.LinkedHashMap;
-
-import com.vaadin.tests.components.abstractfield.LegacyAbstractTextFieldTest;
-import com.vaadin.v7.ui.TextArea;
-
-public class TextAreaTest extends LegacyAbstractTextFieldTest<TextArea> {
-
-    private Command<TextArea, Boolean> wordwrapCommand = new Command<TextArea, Boolean>() {
-        @Override
-        public void execute(TextArea c, Boolean value, Object data) {
-            c.setWordwrap(value);
-        }
-    };
-
-    private Command<TextArea, Integer> rowsCommand = new Command<TextArea, Integer>() {
-        @Override
-        public void execute(TextArea c, Integer value, Object data) {
-            c.setRows(value);
-        }
-    };
-
-    @Override
-    protected Class<TextArea> getTestClass() {
-        return TextArea.class;
-    }
-
-    @Override
-    protected void createActions() {
-        super.createActions();
-        createWordwrapAction(CATEGORY_FEATURES);
-        createRowsAction(CATEGORY_FEATURES);
-    }
-
-    private void createRowsAction(String category) {
-        LinkedHashMap<String, Integer> options = createIntegerOptions(20);
-        createSelectAction("Rows", category, options, "3", rowsCommand);
-    }
-
-    private void createWordwrapAction(String category) {
-        createBooleanAction("Wordwrap", category, false, wordwrapCommand);
-    }
-
-}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents.java
deleted file mode 100644
index 961c88374c..0000000000
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents.java
+++ /dev/null
@@ -1,146 +0,0 @@
-package com.vaadin.tests.components.textfield;
-
-import com.vaadin.event.FieldEvents.TextChangeEvent;
-import com.vaadin.event.FieldEvents.TextChangeListener;
-import com.vaadin.shared.ui.textfield.ValueChangeMode;
-import com.vaadin.tests.components.TestBase;
-import com.vaadin.tests.util.Log;
-import com.vaadin.tests.util.TestUtils;
-import com.vaadin.ui.TextArea;
-import com.vaadin.ui.TextField;
-
-public class TextChangeEvents extends TestBase {
-    Log l = new Log(10);
-
-    @Override
-    protected void setup() {
-
-        TextField tf = new TextField("Default");
-
-        TextChangeListener inputEventListener = new TextChangeListener() {
-
-            @Override
-            public void textChange(TextChangeEvent event) {
-                l.log("Text change event for  "
-                        + event.getComponent().getCaption()
-                        + ", text content currently:'" + event.getText()
-                        + "' Cursor at index:" + event.getCursorPosition());
-            }
-        };
-
-        tf.addValueChangeListener(listener -> {
-            l.log("Text change event for  " + tf.getCaption()
-                    + ", text content currently:'" + listener.getValue()
-                    + "' Cursor at index:" + tf.getCursorPosition());
-        });
-
-        getLayout().addComponent(tf);
-
-        TextField eager = new TextField("Eager");
-        eager.addValueChangeListener(listener -> {
-            l.log("Text change event for  " + eager.getCaption()
-                    + ", text content currently:'" + listener.getValue()
-                    + "' Cursor at index:" + eager.getCursorPosition());
-        });
-        eager.setValueChangeMode(ValueChangeMode.EAGER);
-        getLayout().addComponent(eager);
-
-        TextField to = new TextField("Timeout 3s");
-        to.addValueChangeListener(listener -> {
-            l.log("Text change event for  " + to.getCaption()
-                    + ", text content currently:'" + listener.getValue()
-                    + "' Cursor at index:" + to.getCursorPosition());
-        });
-        to.setValueChangeMode(ValueChangeMode.TIMEOUT);
-        to.setValueChangeTimeout(3000);
-        getLayout().addComponent(to);
-
-        TextArea ta = new TextArea("Default text area");
-        ta.addValueChangeListener(listener -> {
-            l.log("Text change event for  " + ta.getCaption()
-                    + ", text content currently:'" + listener.getValue()
-                    + "' Cursor at index:" + ta.getCursorPosition());
-        });
-        getLayout().addComponent(ta);
-
-        VaadinDeveloperNameField vd = new VaadinDeveloperNameField();
-        vd.addValueChangeListener(listener -> {
-            l.log("Text change event for  " + vd.getCaption()
-                    + ", text content currently:'" + listener.getValue()
-                    + "' Cursor at index:" + vd.getCursorPosition());
-        });
-        getLayout().addComponent(vd);
-
-        getLayout().addComponent(l);
-    }
-
-    @Override
-    protected String getDescription() {
-        return "Simple TextChangeEvent test cases.";
-    }
-
-    @Override
-    protected Integer getTicketNumber() {
-        return null;
-    }
-
-    /**
-     * "Autosuggest"
-     *
-     * Known issue is timing if suggestion comes while typing more content. IMO
-     * we will not support this kind of features in default TextField, but
-     * hopefully make it easily extendable to perfect suggest feature. MT
-     * 2010-10
-     *
-     */
-    private class VaadinDeveloperNameField extends TextField {
-        private String[] names = new String[] { "Matti Tahvonen",
-                "Marc Englund", "Joonas Lehtinen", "Jouni Koivuviita",
-                "Marko Grönroos", "Artur Signell" };
-
-        public VaadinDeveloperNameField() {
-            setCaption("Start typing 'old' Vaadin developers.");
-            addValueChangeListener(listener -> {
-                boolean atTheEndOfText = listener.getValue()
-                        .length() == getCursorPosition();
-                String match = findMatch(listener.getValue());
-                if (match != null) {
-                    setStyleName("match");
-                    String curText = listener.getValue();
-                    int matchlenght = curText.length();
-                    // autocomplete if caret is at the end of the text
-                    if (atTheEndOfText) {
-                        suggest(match, matchlenght);
-                    }
-                } else {
-                    setStyleName("nomatch");
-                }
-            });
-            setStyleName("nomatch");
-        }
-
-        @Override
-        public void attach() {
-            super.attach();
-            TestUtils.injectCSS(getUI(), ".match { background:green ;} "
-                    + ".nomatch {background:red;}");
-        }
-
-        private void suggest(String match, int matchlenght) {
-            setValue(match);
-            setSelection(matchlenght, match.length() - matchlenght);
-        }
-
-        private String findMatch(String currentTextContent) {
-            if (currentTextContent.length() > 0) {
-                for (int i = 0; i < names.length; i++) {
-                    if (names[i].startsWith(currentTextContent)) {
-                        return names[i];
-                    }
-                }
-            }
-            return null;
-        }
-    }
-
-}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java
deleted file mode 100644
index ee1b1b08db..0000000000
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEvents2.java
+++ /dev/null
@@ -1,189 +0,0 @@
-package com.vaadin.tests.components.textfield;
-
-import com.vaadin.event.FieldEvents.BlurEvent;
-import com.vaadin.event.FieldEvents.BlurListener;
-import com.vaadin.event.FieldEvents.FocusEvent;
-import com.vaadin.event.FieldEvents.FocusListener;
-import com.vaadin.event.FieldEvents.TextChangeEvent;
-import com.vaadin.event.FieldEvents.TextChangeListener;
-import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.HorizontalLayout;
-import com.vaadin.ui.Label;
-import com.vaadin.v7.data.Property.ValueChangeEvent;
-import com.vaadin.v7.data.Property.ValueChangeListener;
-import com.vaadin.v7.ui.AbstractTextField.TextChangeEventMode;
-import com.vaadin.v7.ui.TextField;
-
-public class TextChangeEvents2 extends TestBase {
-    @Override
-    protected void setup() {
-
-        {
-            final TextField tf = new TextField("Debug");
-            getLayout().addComponent(tf);
-
-            tf.addTextChangeListener(new TextChangeListener() {
-                @Override
-                public void textChange(TextChangeEvent event) {
-                    System.err.println(tf.getCaption() + " textChange");
-                }
-            });
-
-            tf.addListener(new ValueChangeListener() {
-                @Override
-                public void valueChange(ValueChangeEvent event) {
-                    System.err.println(tf.getCaption() + " valueChange");
-                }
-            });
-
-            tf.addBlurListener(new BlurListener() {
-
-                @Override
-                public void blur(BlurEvent event) {
-                    System.err.println(tf.getCaption() + " blur");
-                }
-            });
-
-            tf.addFocusListener(new FocusListener() {
-                @Override
-                public void focus(FocusEvent event) {
-                    System.err.println(tf.getCaption() + " focus");
-                }
-            });
-
-        }
-
-        {
-            final TextField tf = new TextField("Label");
-            getLayout().addComponent(tf);
-            final Label l = new Label();
-            getLayout().addComponent(l);
-            tf.addTextChangeListener(new TextChangeListener() {
-                @Override
-                public void textChange(TextChangeEvent event) {
-                    l.setValue(event.getText());
-                }
-            });
-
-            tf.addListener(new ValueChangeListener() {
-                @Override
-                public void valueChange(ValueChangeEvent event) {
-                    System.err.println(tf.getCaption() + " valueChange");
-                }
-            });
-
-        }
-
-        {
-            final TextField tf = new TextField("Slow label");
-            tf.setTextChangeTimeout(2000);
-            tf.setImmediate(true);
-            getLayout().addComponent(tf);
-            final Label l = new Label();
-            getLayout().addComponent(l);
-            tf.addTextChangeListener(new TextChangeListener() {
-
-                @Override
-                public void textChange(TextChangeEvent event) {
-                    l.setValue(event.getText());
-                }
-            });
-
-            tf.addListener(new ValueChangeListener() {
-                @Override
-                public void valueChange(ValueChangeEvent event) {
-                    System.err.println(tf.getCaption() + " valueChange");
-                }
-            });
-
-        }
-
-        {
-            final TextField tf = new TextField("Uppercase");
-            tf.setTextChangeTimeout(1);
-            getLayout().addComponent(tf);
-            final Label l = new Label();
-            getLayout().addComponent(l);
-            tf.addTextChangeListener(new TextChangeListener() {
-
-                @Override
-                public void textChange(TextChangeEvent event) {
-                    tf.setValue(event.getText().toUpperCase());
-                }
-            });
-
-            tf.addListener(new ValueChangeListener() {
-                @Override
-                public void valueChange(ValueChangeEvent event) {
-                    System.err.println(tf.getCaption() + " valueChange");
-                }
-            });
-
-        }
-
-        {
-            final TextField[] tfs = new TextField[] {
-                    new TextField(), new TextField(),
-                    new TextField(), new TextField() };
-            HorizontalLayout hl = new HorizontalLayout();
-            hl.setCaption("Blää");
-            getLayout().addComponent(hl);
-            for (TextField tf : tfs) {
-                tf.setColumns(4);
-                tf.setTextChangeEventMode(TextChangeEventMode.EAGER);
-                hl.addComponent(tf);
-
-                tf.addTextChangeListener(new TextChangeListener() {
-
-                    @Override
-                    public void textChange(TextChangeEvent event) {
-                        String txt = event.getText();
-                        int len = txt.length();
-                        if (len >= 4) {
-                            int idx = 0;
-                            while (tfs[idx] != event.getComponent()) {
-                                idx++;
-                            }
-                            tfs[idx].setValue("");
-                            tfs[idx].setValue(txt.substring(0, 4));
-                            if (idx < tfs.length - 1) {
-                                TextField next = tfs[idx + 1];
-                                next.focus();
-                                if (len > 4) {
-                                    next.setValue(txt.substring(4,
-                                            len > 8 ? 8 : len));
-                                } else {
-                                    next.selectAll();
-                                }
-                            }
-                        }
-                    }
-                });
-                tf.addListener(new ValueChangeListener() {
-
-                    @Override
-                    public void valueChange(ValueChangeEvent event) {
-                        TextField tf = (TextField) event
-                                .getProperty();
-                        String val = tf.getValue();
-                        if (val != null && val.length() > 4) {
-                            tf.setValue(val.substring(0, 4));
-                        }
-                    }
-                });
-            }
-
-        }
-    }
-
-    @Override
-    protected String getDescription() {
-        return "Another set of simple use case/tests for TextChangeEvents";
-    }
-
-    @Override
-    protected Integer getTicketNumber() {
-        return 2387;
-    }
-
-}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java
deleted file mode 100644
index 1c10817add..0000000000
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsEternalLoop.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.vaadin.tests.components.textfield;
-
-import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.TextField;
-
-public class TextChangeEventsEternalLoop extends TestBase {
-    @Override
-    protected void setup() {
-
-        final TextField tf = new TextField("Debug");
-        getLayout().addComponent(tf);
-
-        tf.addValueChangeListener(listener -> tf.setValue(listener.getValue()));
-    }
-
-    @Override
-    protected String getDescription() {
-        return "Moving current text to value in text change listener should not cause eternal loop.";
-    }
-
-    @Override
-    protected Integer getTicketNumber() {
-        return 6376;
-    }
-
-}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
deleted file mode 100644
index c0745aac00..0000000000
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.vaadin.tests.components.textfield;
-
-import com.vaadin.event.FieldEvents.TextChangeEvent;
-import com.vaadin.event.FieldEvents.TextChangeListener;
-import com.vaadin.tests.components.TestBase;
-import com.vaadin.tests.util.Log;
-import com.vaadin.v7.data.Property.ValueChangeEvent;
-import com.vaadin.v7.data.Property.ValueChangeListener;
-import com.vaadin.v7.ui.TextField;
-
-public class TextChangeEventsWithNonImmediateValueChange extends TestBase {
-    Log l = new Log(5);
-
-    @Override
-    protected void setup() {
-
-        TextField tf = new TextField("Default");
-
-        TextChangeListener inputEventListener = new TextChangeListener() {
-
-            @Override
-            public void textChange(TextChangeEvent event) {
-                l.log("Text change event, text content currently:'"
-                        + event.getText() + "' Cursor at index:"
-                        + event.getCursorPosition());
-            }
-        };
-
-        tf.addTextChangeListener(inputEventListener);
-
-        // tf.setImmediate(true); // works when this is set
-
-        tf.addListener(new ValueChangeListener() {
-
-            @Override
-            public void valueChange(ValueChangeEvent event) {
-                l.log("Value change: '" + event.getProperty().getValue() + "'");
-            }
-        });
-
-        getLayout().addComponent(tf);
-
-        getLayout().addComponent(l);
-    }
-
-    @Override
-    protected String getDescription() {
-        return "Type a, pause for a second, type ENTER,  type a. Text field should not forget the last textchange event right after valuechange (enter)."
-                + "<br />Then press backspace. The text field should send a text change event even though the text in the field is the same as the field's value";
-    }
-
-    @Override
-    protected Integer getTicketNumber() {
-        return 6866;
-    }
-
-}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
deleted file mode 100644
index 206ef8e41b..0000000000
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.vaadin.tests.components.textfield;
-
-import com.vaadin.event.FieldEvents.TextChangeEvent;
-import com.vaadin.event.FieldEvents.TextChangeListener;
-import com.vaadin.tests.components.TestBase;
-import com.vaadin.tests.util.TestUtils;
-import com.vaadin.v7.ui.AbstractTextField.TextChangeEventMode;
-import com.vaadin.v7.ui.TextField;
-
-public class TextChangeListenerChangingNonTextProperties extends TestBase {
-
-    int index = 0;
-    String[] styles = { "red", "green", "blue", "cyan", "magenta" };
-
-    private String getNextStyle() {
-        return styles[++index % styles.length];
-    }
-
-    @Override
-    protected void setup() {
-        final TextField tf2 = new TextField("Updates width") {
-            @Override
-            public void attach() {
-                super.attach();
-                TestUtils.injectCSS(getUI(), ".red { background:red;} "
-                        + ".green { background:green;} .blue { background:blue;} .cyan { background:cyan;} .magenta { background:magenta;}");
-            }
-        };
-        tf2.setTextChangeEventMode(TextChangeEventMode.EAGER);
-        tf2.addTextChangeListener(new TextChangeListener() {
-            @Override
-            public void textChange(TextChangeEvent event) {
-                tf2.setStyleName(getNextStyle());
-            }
-
-        });
-        tf2.setImmediate(true);
-
-        addComponent(tf2);
-    }
-
-    @Override
-    protected String getDescription() {
-        return "The color (style name) of field changes on each text change event. This should not disturb typing.";
-    }
-
-    @Override
-    protected Integer getTicketNumber() {
-        return Integer.valueOf(6588);
-    }
-
-}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerLosesFocus.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerLosesFocus.java
deleted file mode 100644
index bac833f626..0000000000
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeListenerLosesFocus.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2012 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.components.textfield;
-
-import com.vaadin.event.FieldEvents.TextChangeEvent;
-import com.vaadin.event.FieldEvents.TextChangeListener;
-import com.vaadin.tests.components.TestBase;
-import com.vaadin.tests.util.TestUtils;
-import com.vaadin.v7.ui.AbstractTextField;
-import com.vaadin.v7.ui.Field;
-import com.vaadin.v7.ui.TextArea;
-import com.vaadin.v7.ui.TextField;
-
-public class TextChangeListenerLosesFocus extends TestBase {
-
-    private final TextChangeListener listener = new TextChangeListener() {
-        @Override
-        public void textChange(TextChangeEvent event) {
-            final String value = event.getText();
-            if (value.length() > 2) {
-                ((Field) event.getComponent())
-                        .setValue("Updated by TextChangeListener");
-            }
-        }
-    };
-
-    @Override
-    protected void setup() {
-        TestUtils.injectCSS(getMainWindow(),
-                ".v-textfield-focus, .v-textarea-focus { "
-                        + " background: #E8F0FF !important }");
-
-        AbstractTextField field = new TextField();
-        field.setDebugId("test-textfield");
-        field.setInputPrompt("Enter at least 3 characters");
-        field.addTextChangeListener(listener);
-        addComponent(field);
-
-        field = new TextArea();
-        field.setDebugId("test-textarea");
-        field.setInputPrompt("Enter at least 3 characters");
-        field.addTextChangeListener(listener);
-        addComponent(field);
-
-    }
-
-    @Override
-    protected String getDescription() {
-        return "Updating a focused TextField overwrites the focus stylename";
-    }
-
-    @Override
-    protected Integer getTicketNumber() {
-        return 11623;
-    }
-}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java
deleted file mode 100644
index b6d16ab5fe..0000000000
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextChangeTimeoutAfterDetach.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.vaadin.tests.components.textfield;
-
-import com.vaadin.event.FieldEvents.TextChangeEvent;
-import com.vaadin.event.FieldEvents.TextChangeListener;
-import com.vaadin.tests.components.TestBase;
-import com.vaadin.ui.Button;
-import com.vaadin.ui.Button.ClickEvent;
-import com.vaadin.ui.Label;
-import com.vaadin.v7.ui.AbstractTextField.TextChangeEventMode;
-import com.vaadin.v7.ui.TextField;
-
-public class TextChangeTimeoutAfterDetach extends TestBase {
-
-    @Override
-    protected void setup() {
-        final TextField field = new TextField();
-        field.setImmediate(false);
-        field.setTextChangeTimeout(2000);
-        field.setTextChangeEventMode(TextChangeEventMode.TIMEOUT);
-        field.addTextChangeListener(new TextChangeListener() {
-            @Override
-            public void textChange(TextChangeEvent event) {
-                // Need to add a listener for events to occur
-            }
-        });
-        addComponent(field);
-
-        Button detachBtn = new Button("detach field",
-                new Button.ClickListener() {
-                    @Override
-                    public void buttonClick(ClickEvent event) {
-                        removeComponent(field);
-                        getLayout().addComponentAsFirst(
-                                new Label("Field detached!"));
-                    }
-                });
-        addComponent(detachBtn);
-    }
-
-    @Override
-    protected String getDescription() {
-        return "The textfield has a TextChangeTimout of 1 second. Edit the field and immidietly detach the field and you will cause an \"Out Of Sync\" error.";
-    }
-
-    @Override
-    protected Integer getTicketNumber() {
-        return 6507;
-    }
-
-}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java
deleted file mode 100644
index a719515aa3..0000000000
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldEagerRepaint.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package com.vaadin.tests.components.textfield;
-
-import com.vaadin.event.FieldEvents.TextChangeEvent;
-import com.vaadin.event.FieldEvents.TextChangeListener;
-import com.vaadin.tests.components.TestBase;
-import com.vaadin.v7.ui.AbstractTextField.TextChangeEventMode;
-import com.vaadin.v7.ui.TextField;
-
-public class TextFieldEagerRepaint extends TestBase {
-
-    @Override
-    protected void setup() {
-
-        final TextField tf1 = new TextField("Updates value");
-        tf1.setTextChangeEventMode(TextChangeEventMode.EAGER);
-        tf1.addTextChangeListener(new TextChangeListener() {
-            @Override
-            public void textChange(TextChangeEvent event) {
-                String text = event.getText();
-                if (!text.matches("[a-z]*")) {
-                    String newValue = text.replaceAll("[^a-z]", "");
-                    tf1.setValue(newValue);
-                }
-            }
-        });
-
-        final TextField tf2 = new TextField("Updates width");
-        tf2.setTextChangeEventMode(TextChangeEventMode.EAGER);
-        tf2.addTextChangeListener(new TextChangeListener() {
-            @Override
-            public void textChange(TextChangeEvent event) {
-                String text = event.getText();
-                if (!text.matches("[a-z]*")) {
-                    tf2.setWidth("100px");
-                } else {
-                    tf2.setWidth("150px");
-                }
-            }
-        });
-
-        addComponent(tf1);
-        addComponent(tf2);
-    }
-
-    @Override
-    protected String getDescription() {
-        return "Updating the value in an EAGER TextChangeListener should send the new value to the client while updating something else (e.g. the width) should preserve the text in the field. Both fields react when the field contains anything else than lower case letters a-z";
-    }
-
-    @Override
-    protected Integer getTicketNumber() {
-        return Integer.valueOf(6588);
-    }
-
-}
diff --git a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTest.java
deleted file mode 100644
index 35f61f7419..0000000000
--- a/uitest/src/main/java/com/vaadin/tests/components/textfield/TextFieldTest.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.vaadin.tests.components.textfield;
-
-import com.vaadin.event.FieldEvents.TextChangeListener;
-import com.vaadin.tests.components.abstractfield.LegacyAbstractTextFieldTest;
-import com.vaadin.v7.ui.TextField;
-
-public class TextFieldTest extends LegacyAbstractTextFieldTest<TextField>
-        implements TextChangeListener {
-
-    @Override
-    protected Class<TextField> getTestClass() {
-        return TextField.class;
-    }
-
-    @Override
-    protected void createActions() {
-        super.createActions();
-    }
-
-}
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/passwordfield/PasswordFieldTest.java b/uitest/src/main/java/com/vaadin/v7/tests/components/passwordfield/PasswordFieldTest.java
new file mode 100644
index 0000000000..e5985641cd
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/passwordfield/PasswordFieldTest.java
@@ -0,0 +1,21 @@
+package com.vaadin.v7.tests.components.passwordfield;
+
+import com.vaadin.v7.event.FieldEvents.TextChangeListener;
+import com.vaadin.v7.tests.components.textfield.AbstractTextFieldTest;
+import com.vaadin.v7.ui.PasswordField;
+
+public class PasswordFieldTest
+        extends AbstractTextFieldTest<PasswordField>
+        implements TextChangeListener {
+
+    @Override
+    protected Class<PasswordField> getTestClass() {
+        return PasswordField.class;
+    }
+
+    @Override
+    protected void createActions() {
+        super.createActions();
+    }
+
+}
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/textarea/TextAreaCursorPosition.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textarea/TextAreaCursorPosition.java
new file mode 100644
index 0000000000..eb08a9494b
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textarea/TextAreaCursorPosition.java
@@ -0,0 +1,49 @@
+package com.vaadin.v7.tests.components.textarea;
+
+import com.vaadin.shared.ui.textfield.ValueChangeMode;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.AbstractField;
+import com.vaadin.ui.AbstractTextField;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.TextArea;
+import com.vaadin.ui.TextField;
+
+public class TextAreaCursorPosition extends TestBase {
+
+    private TextField cursorPosition = new TextField("Cursor position");
+
+    @Override
+    public void setup() {
+        Label label = new Label(
+                "Test of calculation of cursor position of TextArea");
+        TextArea textArea = new TextArea();
+        addListener(textArea);
+        addComponent(label);
+        addComponent(textArea);
+        addComponent(cursorPosition);
+        cursorPosition.setValue("?");
+        addComponent(new Button("Force position update"));
+    }
+
+    public void addListener(AbstractField newField) {
+        AbstractTextField newTextField = (AbstractTextField) newField;
+        newTextField.setValueChangeMode(ValueChangeMode.EAGER);
+        newTextField.addValueChangeListener(event -> {
+            AbstractTextField component = (AbstractTextField) event.getSource();
+            cursorPosition
+                    .setValue(String.valueOf(component.getCursorPosition()));
+        });
+    }
+
+    @Override
+    protected String getDescription() {
+        return "Writing something in the field updates the cursor position field. The position field can also be updated using the button.";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 7726;
+    }
+
+}
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/textarea/TextAreaTest.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textarea/TextAreaTest.java
new file mode 100644
index 0000000000..b4048fe9b2
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textarea/TextAreaTest.java
@@ -0,0 +1,45 @@
+package com.vaadin.v7.tests.components.textarea;
+
+import java.util.LinkedHashMap;
+
+import com.vaadin.v7.tests.components.textfield.AbstractTextFieldTest;
+import com.vaadin.v7.ui.TextArea;
+
+public class TextAreaTest extends AbstractTextFieldTest<TextArea> {
+
+    private Command<TextArea, Boolean> wordwrapCommand = new Command<TextArea, Boolean>() {
+        @Override
+        public void execute(TextArea c, Boolean value, Object data) {
+            c.setWordwrap(value);
+        }
+    };
+
+    private Command<TextArea, Integer> rowsCommand = new Command<TextArea, Integer>() {
+        @Override
+        public void execute(TextArea c, Integer value, Object data) {
+            c.setRows(value);
+        }
+    };
+
+    @Override
+    protected Class<TextArea> getTestClass() {
+        return TextArea.class;
+    }
+
+    @Override
+    protected void createActions() {
+        super.createActions();
+        createWordwrapAction(CATEGORY_FEATURES);
+        createRowsAction(CATEGORY_FEATURES);
+    }
+
+    private void createRowsAction(String category) {
+        LinkedHashMap<String, Integer> options = createIntegerOptions(20);
+        createSelectAction("Rows", category, options, "3", rowsCommand);
+    }
+
+    private void createWordwrapAction(String category) {
+        createBooleanAction("Wordwrap", category, false, wordwrapCommand);
+    }
+
+}
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/AbstractTextFieldTest.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/AbstractTextFieldTest.java
new file mode 100644
index 0000000000..604eb707ee
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/AbstractTextFieldTest.java
@@ -0,0 +1,255 @@
+package com.vaadin.v7.tests.components.textfield;
+
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+import com.vaadin.tests.components.abstractfield.LegacyAbstractFieldTest;
+import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
+import com.vaadin.v7.event.FieldEvents.TextChangeListener;
+import com.vaadin.v7.ui.AbstractTextField;
+import com.vaadin.v7.ui.AbstractTextField.TextChangeEventMode;
+
+public abstract class AbstractTextFieldTest<T extends AbstractTextField>
+        extends LegacyAbstractFieldTest<T> implements TextChangeListener {
+
+    private Command<T, Integer> maxlengthCommand = new Command<T, Integer>() {
+
+        @Override
+        public void execute(T c, Integer value, Object data) {
+            c.setMaxLength(value);
+        }
+    };
+    private Command<T, Boolean> nullSelectionAllowedCommand = new Command<T, Boolean>() {
+
+        @Override
+        public void execute(T c, Boolean value, Object data) {
+            c.setNullSettingAllowed(value);
+
+        }
+    };
+    private Command<T, String> nullRepresentationCommand = new Command<T, String>() {
+
+        @Override
+        public void execute(T c, String value, Object data) {
+            c.setNullRepresentation(value);
+        }
+    };
+
+    private Command<T, String> inputPromptCommand = new Command<T, String>() {
+        @Override
+        public void execute(T c, String value, Object data) {
+            c.setInputPrompt(value);
+        }
+    };
+
+    private Command<T, Boolean> textChangeListenerCommand = new Command<T, Boolean>() {
+        @Override
+        public void execute(T c, Boolean value, Object data) {
+            if (value) {
+                c.addListener((TextChangeListener) AbstractTextFieldTest.this);
+            } else {
+                c.removeListener(
+                        (TextChangeListener) AbstractTextFieldTest.this);
+            }
+        }
+    };
+
+    private Command<T, Integer> colsCommand = new Command<T, Integer>() {
+        @Override
+        public void execute(T c, Integer value, Object data) {
+            c.setColumns(value);
+        }
+    };
+
+    private Command<T, TextChangeEventMode> textChangeEventModeCommand = new Command<T, TextChangeEventMode>() {
+        @Override
+        public void execute(T c, TextChangeEventMode value, Object data) {
+            c.setTextChangeEventMode(value);
+        }
+    };
+
+    private Command<T, Integer> textChangeTimeoutCommand = new Command<T, Integer>() {
+        @Override
+        public void execute(T c, Integer value, Object data) {
+            c.setTextChangeTimeout(value);
+        }
+    };
+
+    private Command<T, Range> selectionRangeCommand = new Command<T, Range>() {
+        @Override
+        public void execute(T c, Range value, Object data) {
+            c.setSelectionRange(value.getStart(),
+                    value.getEnd() - value.getStart());
+
+        }
+    };
+    private Command<T, Object> selectAllCommand = new Command<T, Object>() {
+        @Override
+        public void execute(T c, Object value, Object data) {
+            c.selectAll();
+        }
+    };
+
+    private Command<T, Integer> setCursorPositionCommand = new Command<T, Integer>() {
+
+        @Override
+        public void execute(T c, Integer value, Object data) {
+            c.setCursorPosition(value);
+        }
+    };
+
+    @Override
+    protected void createActions() {
+        super.createActions();
+
+        createSetTextValueAction(CATEGORY_ACTIONS);
+
+        createNullSettingAllowedAction(CATEGORY_FEATURES);
+        createNullRepresentationAction(CATEGORY_FEATURES);
+        createMaxLengthAction(CATEGORY_FEATURES);
+
+        createInputPromptAction(CATEGORY_FEATURES);
+        createColsAction(CATEGORY_STATE);
+
+        createTextChangeListener(CATEGORY_LISTENERS);
+        createTextChangeEventModeAction(CATEGORY_FEATURES);
+        createTextChangeEventTimeoutAction(CATEGORY_FEATURES);
+
+        createSetTextValueAction(CATEGORY_ACTIONS);
+        createCursorPositionAction(CATEGORY_ACTIONS);
+        createSelectionRangeAction(CATEGORY_ACTIONS);
+
+    }
+
+    private void createNullSettingAllowedAction(String category) {
+        createBooleanAction("Null selection allowed", category, true,
+                nullSelectionAllowedCommand);
+    }
+
+    private void createNullRepresentationAction(String category) {
+        LinkedHashMap<String, String> options = new LinkedHashMap<String, String>();
+        options.put("-", null);
+        options.put("null", "null");
+        options.put("This is empty", "This is empty");
+        options.put("- Nothing -", "- Nothing -");
+        createSelectAction("Null representation", category, options, "null",
+                nullRepresentationCommand);
+    }
+
+    private void createMaxLengthAction(String category) {
+        LinkedHashMap<String, Integer> options = createIntegerOptions(100);
+        options.put("-", -1);
+        createSelectAction("Max length", category, options, "-",
+                maxlengthCommand);
+
+    }
+
+    public class Range {
+        private int start;
+        private int end;
+
+        public Range(int start, int end) {
+            this.start = start;
+            this.end = end;
+        }
+
+        public int getStart() {
+            return start;
+        }
+
+        public int getEnd() {
+            return end;
+        }
+
+        @Override
+        public String toString() {
+            return start + "-" + end;
+        }
+    }
+
+    private void createSelectionRangeAction(String category) {
+        List<Range> options = new ArrayList<Range>();
+        options.add(new Range(0, 10));
+        options.add(new Range(0, 1));
+        options.add(new Range(0, 2));
+        options.add(new Range(1, 2));
+        options.add(new Range(2, 5));
+        options.add(new Range(5, 10));
+
+        createCategory("Select range", category);
+
+        createClickAction("All", "Select range", selectAllCommand, null);
+        for (Range range : options) {
+            createClickAction(range.toString(), "Select range",
+                    selectionRangeCommand, range);
+        }
+
+    }
+
+    private void createCursorPositionAction(String category) {
+        String subCategory = "Set cursor position";
+        createCategory(subCategory, category);
+        for (int i = 0; i < 20; i++) {
+            createClickAction(String.valueOf(i), subCategory,
+                    setCursorPositionCommand, Integer.valueOf(i));
+        }
+
+    }
+
+    private void createTextChangeEventTimeoutAction(String category) {
+        LinkedHashMap<String, Integer> options = new LinkedHashMap<String, Integer>();
+        options.put("0", 0);
+        options.put("100ms", 100);
+        options.put("500ms", 500);
+        options.put("1s", 1000);
+        options.put("2s", 2000);
+        options.put("5s", 5000);
+
+        createSelectAction("TextChange timeout", category, options, "0",
+                textChangeTimeoutCommand);
+    }
+
+    private void createTextChangeEventModeAction(String category) {
+        LinkedHashMap<String, TextChangeEventMode> options = new LinkedHashMap<String, AbstractTextField.TextChangeEventMode>();
+        for (TextChangeEventMode m : TextChangeEventMode.values()) {
+            options.put(m.toString(), m);
+        }
+
+        createSelectAction("TextChange event mode", category, options,
+                TextChangeEventMode.EAGER.toString(),
+                textChangeEventModeCommand);
+
+    }
+
+    private void createTextChangeListener(String category) {
+        createBooleanAction("Text change listener", category, false,
+                textChangeListenerCommand);
+
+    }
+
+    private void createColsAction(String category) {
+        LinkedHashMap<String, Integer> options = createIntegerOptions(20);
+        createSelectAction("Columns", category, options, "0", colsCommand);
+    }
+
+    private void createInputPromptAction(String category) {
+        LinkedHashMap<String, String> options = new LinkedHashMap<String, String>();
+        options.put("-", null);
+        options.put("Enter a value", "Enter a value");
+        options.put("- Click here -", "- Click here -");
+        createSelectAction("Input prompt", category, options, "-",
+                inputPromptCommand);
+
+    }
+
+    @Override
+    public void textChange(TextChangeEvent event) {
+        AbstractTextField tf = (AbstractTextField) event.getComponent();
+        log("TextChangeEvent: text='" + event.getText() + "', cursor position="
+                + event.getCursorPosition() + " (field cursor pos: "
+                + tf.getCursorPosition() + ")");
+
+    }
+
+}
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEvents.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEvents.java
new file mode 100644
index 0000000000..16e5d59a48
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEvents.java
@@ -0,0 +1,146 @@
+package com.vaadin.v7.tests.components.textfield;
+
+import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
+import com.vaadin.v7.event.FieldEvents.TextChangeListener;
+import com.vaadin.shared.ui.textfield.ValueChangeMode;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.tests.util.Log;
+import com.vaadin.tests.util.TestUtils;
+import com.vaadin.ui.TextArea;
+import com.vaadin.ui.TextField;
+
+public class TextChangeEvents extends TestBase {
+    Log l = new Log(10);
+
+    @Override
+    protected void setup() {
+
+        TextField tf = new TextField("Default");
+
+        TextChangeListener inputEventListener = new TextChangeListener() {
+
+            @Override
+            public void textChange(TextChangeEvent event) {
+                l.log("Text change event for  "
+                        + event.getComponent().getCaption()
+                        + ", text content currently:'" + event.getText()
+                        + "' Cursor at index:" + event.getCursorPosition());
+            }
+        };
+
+        tf.addValueChangeListener(listener -> {
+            l.log("Text change event for  " + tf.getCaption()
+                    + ", text content currently:'" + listener.getValue()
+                    + "' Cursor at index:" + tf.getCursorPosition());
+        });
+
+        getLayout().addComponent(tf);
+
+        TextField eager = new TextField("Eager");
+        eager.addValueChangeListener(listener -> {
+            l.log("Text change event for  " + eager.getCaption()
+                    + ", text content currently:'" + listener.getValue()
+                    + "' Cursor at index:" + eager.getCursorPosition());
+        });
+        eager.setValueChangeMode(ValueChangeMode.EAGER);
+        getLayout().addComponent(eager);
+
+        TextField to = new TextField("Timeout 3s");
+        to.addValueChangeListener(listener -> {
+            l.log("Text change event for  " + to.getCaption()
+                    + ", text content currently:'" + listener.getValue()
+                    + "' Cursor at index:" + to.getCursorPosition());
+        });
+        to.setValueChangeMode(ValueChangeMode.TIMEOUT);
+        to.setValueChangeTimeout(3000);
+        getLayout().addComponent(to);
+
+        TextArea ta = new TextArea("Default text area");
+        ta.addValueChangeListener(listener -> {
+            l.log("Text change event for  " + ta.getCaption()
+                    + ", text content currently:'" + listener.getValue()
+                    + "' Cursor at index:" + ta.getCursorPosition());
+        });
+        getLayout().addComponent(ta);
+
+        VaadinDeveloperNameField vd = new VaadinDeveloperNameField();
+        vd.addValueChangeListener(listener -> {
+            l.log("Text change event for  " + vd.getCaption()
+                    + ", text content currently:'" + listener.getValue()
+                    + "' Cursor at index:" + vd.getCursorPosition());
+        });
+        getLayout().addComponent(vd);
+
+        getLayout().addComponent(l);
+    }
+
+    @Override
+    protected String getDescription() {
+        return "Simple TextChangeEvent test cases.";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return null;
+    }
+
+    /**
+     * "Autosuggest"
+     *
+     * Known issue is timing if suggestion comes while typing more content. IMO
+     * we will not support this kind of features in default TextField, but
+     * hopefully make it easily extendable to perfect suggest feature. MT
+     * 2010-10
+     *
+     */
+    private class VaadinDeveloperNameField extends TextField {
+        private String[] names = new String[] { "Matti Tahvonen",
+                "Marc Englund", "Joonas Lehtinen", "Jouni Koivuviita",
+                "Marko Grönroos", "Artur Signell" };
+
+        public VaadinDeveloperNameField() {
+            setCaption("Start typing 'old' Vaadin developers.");
+            addValueChangeListener(listener -> {
+                boolean atTheEndOfText = listener.getValue()
+                        .length() == getCursorPosition();
+                String match = findMatch(listener.getValue());
+                if (match != null) {
+                    setStyleName("match");
+                    String curText = listener.getValue();
+                    int matchlenght = curText.length();
+                    // autocomplete if caret is at the end of the text
+                    if (atTheEndOfText) {
+                        suggest(match, matchlenght);
+                    }
+                } else {
+                    setStyleName("nomatch");
+                }
+            });
+            setStyleName("nomatch");
+        }
+
+        @Override
+        public void attach() {
+            super.attach();
+            TestUtils.injectCSS(getUI(), ".match { background:green ;} "
+                    + ".nomatch {background:red;}");
+        }
+
+        private void suggest(String match, int matchlenght) {
+            setValue(match);
+            setSelection(matchlenght, match.length() - matchlenght);
+        }
+
+        private String findMatch(String currentTextContent) {
+            if (currentTextContent.length() > 0) {
+                for (int i = 0; i < names.length; i++) {
+                    if (names[i].startsWith(currentTextContent)) {
+                        return names[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
+
+}
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEvents2.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEvents2.java
new file mode 100644
index 0000000000..f59f5aeb38
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEvents2.java
@@ -0,0 +1,189 @@
+package com.vaadin.v7.tests.components.textfield;
+
+import com.vaadin.event.FieldEvents.BlurEvent;
+import com.vaadin.event.FieldEvents.BlurListener;
+import com.vaadin.event.FieldEvents.FocusEvent;
+import com.vaadin.event.FieldEvents.FocusListener;
+import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
+import com.vaadin.v7.event.FieldEvents.TextChangeListener;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.HorizontalLayout;
+import com.vaadin.ui.Label;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.AbstractTextField.TextChangeEventMode;
+import com.vaadin.v7.ui.TextField;
+
+public class TextChangeEvents2 extends TestBase {
+    @Override
+    protected void setup() {
+
+        {
+            final TextField tf = new TextField("Debug");
+            getLayout().addComponent(tf);
+
+            tf.addTextChangeListener(new TextChangeListener() {
+                @Override
+                public void textChange(TextChangeEvent event) {
+                    System.err.println(tf.getCaption() + " textChange");
+                }
+            });
+
+            tf.addListener(new ValueChangeListener() {
+                @Override
+                public void valueChange(ValueChangeEvent event) {
+                    System.err.println(tf.getCaption() + " valueChange");
+                }
+            });
+
+            tf.addBlurListener(new BlurListener() {
+
+                @Override
+                public void blur(BlurEvent event) {
+                    System.err.println(tf.getCaption() + " blur");
+                }
+            });
+
+            tf.addFocusListener(new FocusListener() {
+                @Override
+                public void focus(FocusEvent event) {
+                    System.err.println(tf.getCaption() + " focus");
+                }
+            });
+
+        }
+
+        {
+            final TextField tf = new TextField("Label");
+            getLayout().addComponent(tf);
+            final Label l = new Label();
+            getLayout().addComponent(l);
+            tf.addTextChangeListener(new TextChangeListener() {
+                @Override
+                public void textChange(TextChangeEvent event) {
+                    l.setValue(event.getText());
+                }
+            });
+
+            tf.addListener(new ValueChangeListener() {
+                @Override
+                public void valueChange(ValueChangeEvent event) {
+                    System.err.println(tf.getCaption() + " valueChange");
+                }
+            });
+
+        }
+
+        {
+            final TextField tf = new TextField("Slow label");
+            tf.setTextChangeTimeout(2000);
+            tf.setImmediate(true);
+            getLayout().addComponent(tf);
+            final Label l = new Label();
+            getLayout().addComponent(l);
+            tf.addTextChangeListener(new TextChangeListener() {
+
+                @Override
+                public void textChange(TextChangeEvent event) {
+                    l.setValue(event.getText());
+                }
+            });
+
+            tf.addListener(new ValueChangeListener() {
+                @Override
+                public void valueChange(ValueChangeEvent event) {
+                    System.err.println(tf.getCaption() + " valueChange");
+                }
+            });
+
+        }
+
+        {
+            final TextField tf = new TextField("Uppercase");
+            tf.setTextChangeTimeout(1);
+            getLayout().addComponent(tf);
+            final Label l = new Label();
+            getLayout().addComponent(l);
+            tf.addTextChangeListener(new TextChangeListener() {
+
+                @Override
+                public void textChange(TextChangeEvent event) {
+                    tf.setValue(event.getText().toUpperCase());
+                }
+            });
+
+            tf.addListener(new ValueChangeListener() {
+                @Override
+                public void valueChange(ValueChangeEvent event) {
+                    System.err.println(tf.getCaption() + " valueChange");
+                }
+            });
+
+        }
+
+        {
+            final TextField[] tfs = new TextField[] {
+                    new TextField(), new TextField(),
+                    new TextField(), new TextField() };
+            HorizontalLayout hl = new HorizontalLayout();
+            hl.setCaption("Blää");
+            getLayout().addComponent(hl);
+            for (TextField tf : tfs) {
+                tf.setColumns(4);
+                tf.setTextChangeEventMode(TextChangeEventMode.EAGER);
+                hl.addComponent(tf);
+
+                tf.addTextChangeListener(new TextChangeListener() {
+
+                    @Override
+                    public void textChange(TextChangeEvent event) {
+                        String txt = event.getText();
+                        int len = txt.length();
+                        if (len >= 4) {
+                            int idx = 0;
+                            while (tfs[idx] != event.getComponent()) {
+                                idx++;
+                            }
+                            tfs[idx].setValue("");
+                            tfs[idx].setValue(txt.substring(0, 4));
+                            if (idx < tfs.length - 1) {
+                                TextField next = tfs[idx + 1];
+                                next.focus();
+                                if (len > 4) {
+                                    next.setValue(txt.substring(4,
+                                            len > 8 ? 8 : len));
+                                } else {
+                                    next.selectAll();
+                                }
+                            }
+                        }
+                    }
+                });
+                tf.addListener(new ValueChangeListener() {
+
+                    @Override
+                    public void valueChange(ValueChangeEvent event) {
+                        TextField tf = (TextField) event
+                                .getProperty();
+                        String val = tf.getValue();
+                        if (val != null && val.length() > 4) {
+                            tf.setValue(val.substring(0, 4));
+                        }
+                    }
+                });
+            }
+
+        }
+    }
+
+    @Override
+    protected String getDescription() {
+        return "Another set of simple use case/tests for TextChangeEvents";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 2387;
+    }
+
+}
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEventsEternalLoop.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEventsEternalLoop.java
new file mode 100644
index 0000000000..9ca79a3ed1
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEventsEternalLoop.java
@@ -0,0 +1,26 @@
+package com.vaadin.v7.tests.components.textfield;
+
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.TextField;
+
+public class TextChangeEventsEternalLoop extends TestBase {
+    @Override
+    protected void setup() {
+
+        final TextField tf = new TextField("Debug");
+        getLayout().addComponent(tf);
+
+        tf.addValueChangeListener(listener -> tf.setValue(listener.getValue()));
+    }
+
+    @Override
+    protected String getDescription() {
+        return "Moving current text to value in text change listener should not cause eternal loop.";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 6376;
+    }
+
+}
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
new file mode 100644
index 0000000000..8cd6cbed8f
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeEventsWithNonImmediateValueChange.java
@@ -0,0 +1,57 @@
+package com.vaadin.v7.tests.components.textfield;
+
+import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
+import com.vaadin.v7.event.FieldEvents.TextChangeListener;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.tests.util.Log;
+import com.vaadin.v7.data.Property.ValueChangeEvent;
+import com.vaadin.v7.data.Property.ValueChangeListener;
+import com.vaadin.v7.ui.TextField;
+
+public class TextChangeEventsWithNonImmediateValueChange extends TestBase {
+    Log l = new Log(5);
+
+    @Override
+    protected void setup() {
+
+        TextField tf = new TextField("Default");
+
+        TextChangeListener inputEventListener = new TextChangeListener() {
+
+            @Override
+            public void textChange(TextChangeEvent event) {
+                l.log("Text change event, text content currently:'"
+                        + event.getText() + "' Cursor at index:"
+                        + event.getCursorPosition());
+            }
+        };
+
+        tf.addTextChangeListener(inputEventListener);
+
+        // tf.setImmediate(true); // works when this is set
+
+        tf.addListener(new ValueChangeListener() {
+
+            @Override
+            public void valueChange(ValueChangeEvent event) {
+                l.log("Value change: '" + event.getProperty().getValue() + "'");
+            }
+        });
+
+        getLayout().addComponent(tf);
+
+        getLayout().addComponent(l);
+    }
+
+    @Override
+    protected String getDescription() {
+        return "Type a, pause for a second, type ENTER,  type a. Text field should not forget the last textchange event right after valuechange (enter)."
+                + "<br />Then press backspace. The text field should send a text change event even though the text in the field is the same as the field's value";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 6866;
+    }
+
+}
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
new file mode 100644
index 0000000000..458ac5f265
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeListenerChangingNonTextProperties.java
@@ -0,0 +1,52 @@
+package com.vaadin.v7.tests.components.textfield;
+
+import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
+import com.vaadin.v7.event.FieldEvents.TextChangeListener;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.tests.util.TestUtils;
+import com.vaadin.v7.ui.AbstractTextField.TextChangeEventMode;
+import com.vaadin.v7.ui.TextField;
+
+public class TextChangeListenerChangingNonTextProperties extends TestBase {
+
+    int index = 0;
+    String[] styles = { "red", "green", "blue", "cyan", "magenta" };
+
+    private String getNextStyle() {
+        return styles[++index % styles.length];
+    }
+
+    @Override
+    protected void setup() {
+        final TextField tf2 = new TextField("Updates width") {
+            @Override
+            public void attach() {
+                super.attach();
+                TestUtils.injectCSS(getUI(), ".red { background:red;} "
+                        + ".green { background:green;} .blue { background:blue;} .cyan { background:cyan;} .magenta { background:magenta;}");
+            }
+        };
+        tf2.setTextChangeEventMode(TextChangeEventMode.EAGER);
+        tf2.addTextChangeListener(new TextChangeListener() {
+            @Override
+            public void textChange(TextChangeEvent event) {
+                tf2.setStyleName(getNextStyle());
+            }
+
+        });
+        tf2.setImmediate(true);
+
+        addComponent(tf2);
+    }
+
+    @Override
+    protected String getDescription() {
+        return "The color (style name) of field changes on each text change event. This should not disturb typing.";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return Integer.valueOf(6588);
+    }
+
+}
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeListenerLosesFocus.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeListenerLosesFocus.java
new file mode 100644
index 0000000000..8fe5757649
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeListenerLosesFocus.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 2012 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.v7.tests.components.textfield;
+
+import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
+import com.vaadin.v7.event.FieldEvents.TextChangeListener;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.tests.util.TestUtils;
+import com.vaadin.v7.ui.AbstractTextField;
+import com.vaadin.v7.ui.Field;
+import com.vaadin.v7.ui.TextArea;
+import com.vaadin.v7.ui.TextField;
+
+public class TextChangeListenerLosesFocus extends TestBase {
+
+    private final TextChangeListener listener = new TextChangeListener() {
+        @Override
+        public void textChange(TextChangeEvent event) {
+            final String value = event.getText();
+            if (value.length() > 2) {
+                ((Field) event.getComponent())
+                        .setValue("Updated by TextChangeListener");
+            }
+        }
+    };
+
+    @Override
+    protected void setup() {
+        TestUtils.injectCSS(getMainWindow(),
+                ".v-textfield-focus, .v-textarea-focus { "
+                        + " background: #E8F0FF !important }");
+
+        AbstractTextField field = new TextField();
+        field.setDebugId("test-textfield");
+        field.setInputPrompt("Enter at least 3 characters");
+        field.addTextChangeListener(listener);
+        addComponent(field);
+
+        field = new TextArea();
+        field.setDebugId("test-textarea");
+        field.setInputPrompt("Enter at least 3 characters");
+        field.addTextChangeListener(listener);
+        addComponent(field);
+
+    }
+
+    @Override
+    protected String getDescription() {
+        return "Updating a focused TextField overwrites the focus stylename";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 11623;
+    }
+}
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeTimeoutAfterDetach.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeTimeoutAfterDetach.java
new file mode 100644
index 0000000000..e546695844
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextChangeTimeoutAfterDetach.java
@@ -0,0 +1,50 @@
+package com.vaadin.v7.tests.components.textfield;
+
+import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
+import com.vaadin.v7.event.FieldEvents.TextChangeListener;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Label;
+import com.vaadin.v7.ui.AbstractTextField.TextChangeEventMode;
+import com.vaadin.v7.ui.TextField;
+
+public class TextChangeTimeoutAfterDetach extends TestBase {
+
+    @Override
+    protected void setup() {
+        final TextField field = new TextField();
+        field.setImmediate(false);
+        field.setTextChangeTimeout(2000);
+        field.setTextChangeEventMode(TextChangeEventMode.TIMEOUT);
+        field.addTextChangeListener(new TextChangeListener() {
+            @Override
+            public void textChange(TextChangeEvent event) {
+                // Need to add a listener for events to occur
+            }
+        });
+        addComponent(field);
+
+        Button detachBtn = new Button("detach field",
+                new Button.ClickListener() {
+                    @Override
+                    public void buttonClick(ClickEvent event) {
+                        removeComponent(field);
+                        getLayout().addComponentAsFirst(
+                                new Label("Field detached!"));
+                    }
+                });
+        addComponent(detachBtn);
+    }
+
+    @Override
+    protected String getDescription() {
+        return "The textfield has a TextChangeTimout of 1 second. Edit the field and immidietly detach the field and you will cause an \"Out Of Sync\" error.";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return 6507;
+    }
+
+}
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextFieldEagerRepaint.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextFieldEagerRepaint.java
new file mode 100644
index 0000000000..2a98224789
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextFieldEagerRepaint.java
@@ -0,0 +1,55 @@
+package com.vaadin.v7.tests.components.textfield;
+
+import com.vaadin.v7.event.FieldEvents.TextChangeEvent;
+import com.vaadin.v7.event.FieldEvents.TextChangeListener;
+import com.vaadin.tests.components.TestBase;
+import com.vaadin.v7.ui.AbstractTextField.TextChangeEventMode;
+import com.vaadin.v7.ui.TextField;
+
+public class TextFieldEagerRepaint extends TestBase {
+
+    @Override
+    protected void setup() {
+
+        final TextField tf1 = new TextField("Updates value");
+        tf1.setTextChangeEventMode(TextChangeEventMode.EAGER);
+        tf1.addTextChangeListener(new TextChangeListener() {
+            @Override
+            public void textChange(TextChangeEvent event) {
+                String text = event.getText();
+                if (!text.matches("[a-z]*")) {
+                    String newValue = text.replaceAll("[^a-z]", "");
+                    tf1.setValue(newValue);
+                }
+            }
+        });
+
+        final TextField tf2 = new TextField("Updates width");
+        tf2.setTextChangeEventMode(TextChangeEventMode.EAGER);
+        tf2.addTextChangeListener(new TextChangeListener() {
+            @Override
+            public void textChange(TextChangeEvent event) {
+                String text = event.getText();
+                if (!text.matches("[a-z]*")) {
+                    tf2.setWidth("100px");
+                } else {
+                    tf2.setWidth("150px");
+                }
+            }
+        });
+
+        addComponent(tf1);
+        addComponent(tf2);
+    }
+
+    @Override
+    protected String getDescription() {
+        return "Updating the value in an EAGER TextChangeListener should send the new value to the client while updating something else (e.g. the width) should preserve the text in the field. Both fields react when the field contains anything else than lower case letters a-z";
+    }
+
+    @Override
+    protected Integer getTicketNumber() {
+        return Integer.valueOf(6588);
+    }
+
+}
diff --git a/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextFieldTest.java b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextFieldTest.java
new file mode 100644
index 0000000000..fd26995abf
--- /dev/null
+++ b/uitest/src/main/java/com/vaadin/v7/tests/components/textfield/TextFieldTest.java
@@ -0,0 +1,19 @@
+package com.vaadin.v7.tests.components.textfield;
+
+import com.vaadin.v7.event.FieldEvents.TextChangeListener;
+import com.vaadin.v7.ui.TextField;
+
+public class TextFieldTest extends AbstractTextFieldTest<TextField>
+        implements TextChangeListener {
+
+    @Override
+    protected Class<TextField> getTestClass() {
+        return TextField.class;
+    }
+
+    @Override
+    protected void createActions() {
+        super.createActions();
+    }
+
+}
-- 
cgit v1.2.3