From da98958f4b7c4f3a649cf8bbecd575302bb30e05 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Mon, 8 Aug 2016 16:04:57 +0300 Subject: Rename AbstractFieldTest to LegacyAbstractFieldTest Change-Id: I6cc419884ecba7f75e825ddcba343325b2d77f1b --- .../abstractfield/AbstractFieldTest.java | 201 -------------------- .../abstractfield/AbstractTextFieldTest.java | 2 +- .../abstractfield/LegacyAbstractFieldTest.java | 206 +++++++++++++++++++++ .../tests/components/checkbox/CheckBoxes2.java | 4 +- .../tests/components/datefield/DateFieldTest.java | 4 +- .../com/vaadin/tests/components/form/FormTest.java | 4 +- .../progressindicator/ProgressBarGenericTest.java | 4 +- .../progressindicator/ProgressIndicatorTest.java | 4 +- .../components/richtextarea/RichTextAreaTest.java | 4 +- .../components/select/AbstractSelectTestCase.java | 4 +- .../vaadin/tests/components/slider/SliderTest.java | 4 +- 11 files changed, 223 insertions(+), 218 deletions(-) delete mode 100644 uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java create mode 100644 uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractFieldTest.java (limited to 'uitest/src') diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java deleted file mode 100644 index fb4913d71e..0000000000 --- a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java +++ /dev/null @@ -1,201 +0,0 @@ -package com.vaadin.tests.components.abstractfield; - -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Locale; - -import com.vaadin.data.Property; -import com.vaadin.data.Property.ReadOnlyStatusChangeEvent; -import com.vaadin.data.Property.ReadOnlyStatusChangeListener; -import com.vaadin.data.Property.ValueChangeListener; -import com.vaadin.legacy.ui.LegacyAbstractField; -import com.vaadin.tests.components.AbstractComponentTest; -import com.vaadin.ui.MenuBar; -import com.vaadin.ui.MenuBar.MenuItem; - -public abstract class AbstractFieldTest extends - AbstractComponentTest implements ValueChangeListener, - ReadOnlyStatusChangeListener { - - private boolean sortValueChanges = true; - - @Override - protected void createActions() { - super.createActions(); - - createBooleanAction("Required", CATEGORY_STATE, false, requiredCommand); - createRequiredErrorSelect(CATEGORY_DECORATIONS); - - createValueChangeListener(CATEGORY_LISTENERS); - createReadOnlyStatusChangeListener(CATEGORY_LISTENERS); - - // * invalidcommitted - // * commit() - // * discard() - // * writethrough - // * readthrough - // * addvalidator - // * isvalid - // * invalidallowed - // * error indicator - // - // * validation visible - // * ShortcutListener - - } - - @Override - protected void populateSettingsMenu(MenuItem settingsMenu) { - super.populateSettingsMenu(settingsMenu); - - if (LegacyAbstractField.class.isAssignableFrom(getTestClass())) { - MenuItem abstractField = settingsMenu - .addItem("LegacyAbstractField", null); - abstractField.addItem("Show value", new MenuBar.Command() { - - @Override - public void menuSelected(MenuItem selectedItem) { - for (T a : getTestComponents()) { - log(a.getClass().getSimpleName() + " value: " - + getValue(a)); - } - } - }); - - MenuItem sortValueChangesItem = abstractField.addItem( - "Show sorted value changes", new MenuBar.Command() { - @Override - public void menuSelected(MenuItem selectedItem) { - sortValueChanges = selectedItem.isChecked(); - log("Show sorted value changes: " - + sortValueChanges); - } - }); - sortValueChangesItem.setCheckable(true); - sortValueChangesItem.setChecked(true); - } - } - - private void createRequiredErrorSelect(String category) { - LinkedHashMap options = new LinkedHashMap(); - options.put("-", null); - options.put(TEXT_SHORT, TEXT_SHORT); - options.put("Medium", TEXT_MEDIUM); - options.put("Long", TEXT_LONG); - options.put("Very long", TEXT_VERY_LONG); - createSelectAction("Required error message", category, options, "-", - requiredErrorMessageCommand); - - } - - private void createValueChangeListener(String category) { - - createBooleanAction("Value change listener", category, false, - valueChangeListenerCommand); - } - - private void createReadOnlyStatusChangeListener(String category) { - - createBooleanAction("Read only status change listener", category, - false, readonlyStatusChangeListenerCommand); - } - - protected Command valueChangeListenerCommand = new Command() { - - @Override - public void execute(T c, Boolean value, Object data) { - if (value) { - c.addListener((ValueChangeListener) AbstractFieldTest.this); - } else { - c.removeListener((ValueChangeListener) AbstractFieldTest.this); - } - } - }; - protected Command readonlyStatusChangeListenerCommand = new Command() { - - @Override - public void execute(T c, Boolean value, Object data) { - if (value) { - c.addListener((ReadOnlyStatusChangeListener) AbstractFieldTest.this); - } else { - c.removeListener((ReadOnlyStatusChangeListener) AbstractFieldTest.this); - } - } - }; - - protected Command setValueCommand = new Command() { - - @Override - public void execute(T c, Object value, Object data) { - c.setValue(value); - } - }; - - @Override - public void valueChange(com.vaadin.data.Property.ValueChangeEvent event) { - log(event.getClass().getSimpleName() + ", new value: " - + getValue(event.getProperty())); - } - - @SuppressWarnings({ "rawtypes", "unchecked" }) - private String getValue(Property property) { - Object o = property.getValue(); - if (o instanceof Collection && sortValueChanges) { - // Sort collections to avoid problems with values printed in - // different order - try { - ArrayList c = new ArrayList( - (Collection) o); - Collections.sort(c); - o = c; - } catch (Exception e) { - // continue with unsorted if sorting fails for some reason - log("Exception while sorting value: " + e.getMessage()); - } - } - - // Distinguish between null and 'null' - String value = "null"; - if (o != null) { - if (o instanceof Date) { - Date d = (Date) o; - // Dec 31, 2068 23:09:26.531 - String pattern = "MMM d, yyyy HH:mm:ss.SSS"; - SimpleDateFormat format = new SimpleDateFormat(pattern, - new Locale("en", "US")); - value = format.format(d); - } else { - value = "'" + o.toString() + "'"; - } - } - - return value; - - } - - @Override - public void readOnlyStatusChange(ReadOnlyStatusChangeEvent event) { - log(event.getClass().getSimpleName()); - } - - protected void createSetTextValueAction(String category) { - String subCategory = "Set text value"; - createCategory(subCategory, category); - List values = new ArrayList(); - 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"); - - createClickAction("(empty string)", subCategory, setValueCommand, ""); - createClickAction("(null)", subCategory, setValueCommand, null); - for (String value : values) { - createClickAction(value, subCategory, setValueCommand, value); - } - } - -} 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 - extends AbstractFieldTest implements TextChangeListener { + extends LegacyAbstractFieldTest implements TextChangeListener { private Command maxlengthCommand = new Command() { diff --git a/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractFieldTest.java b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractFieldTest.java new file mode 100644 index 0000000000..795465bb88 --- /dev/null +++ b/uitest/src/main/java/com/vaadin/tests/components/abstractfield/LegacyAbstractFieldTest.java @@ -0,0 +1,206 @@ +package com.vaadin.tests.components.abstractfield; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Date; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Locale; + +import com.vaadin.data.Property; +import com.vaadin.data.Property.ReadOnlyStatusChangeEvent; +import com.vaadin.data.Property.ReadOnlyStatusChangeListener; +import com.vaadin.data.Property.ValueChangeListener; +import com.vaadin.legacy.ui.LegacyAbstractField; +import com.vaadin.tests.components.AbstractComponentTest; +import com.vaadin.ui.MenuBar; +import com.vaadin.ui.MenuBar.MenuItem; + +public abstract class LegacyAbstractFieldTest + extends AbstractComponentTest + implements ValueChangeListener, ReadOnlyStatusChangeListener { + + private boolean sortValueChanges = true; + + @Override + protected void createActions() { + super.createActions(); + + createBooleanAction("Required", CATEGORY_STATE, false, requiredCommand); + createRequiredErrorSelect(CATEGORY_DECORATIONS); + + createValueChangeListener(CATEGORY_LISTENERS); + createReadOnlyStatusChangeListener(CATEGORY_LISTENERS); + + // * invalidcommitted + // * commit() + // * discard() + // * writethrough + // * readthrough + // * addvalidator + // * isvalid + // * invalidallowed + // * error indicator + // + // * validation visible + // * ShortcutListener + + } + + @Override + protected void populateSettingsMenu(MenuItem settingsMenu) { + super.populateSettingsMenu(settingsMenu); + + if (LegacyAbstractField.class.isAssignableFrom(getTestClass())) { + MenuItem abstractField = settingsMenu.addItem("LegacyAbstractField", + null); + abstractField.addItem("Show value", new MenuBar.Command() { + + @Override + public void menuSelected(MenuItem selectedItem) { + for (T a : getTestComponents()) { + log(a.getClass().getSimpleName() + " value: " + + getValue(a)); + } + } + }); + + MenuItem sortValueChangesItem = abstractField.addItem( + "Show sorted value changes", new MenuBar.Command() { + @Override + public void menuSelected(MenuItem selectedItem) { + sortValueChanges = selectedItem.isChecked(); + log("Show sorted value changes: " + + sortValueChanges); + } + }); + sortValueChangesItem.setCheckable(true); + sortValueChangesItem.setChecked(true); + } + } + + private void createRequiredErrorSelect(String category) { + LinkedHashMap options = new LinkedHashMap(); + options.put("-", null); + options.put(TEXT_SHORT, TEXT_SHORT); + options.put("Medium", TEXT_MEDIUM); + options.put("Long", TEXT_LONG); + options.put("Very long", TEXT_VERY_LONG); + createSelectAction("Required error message", category, options, "-", + requiredErrorMessageCommand); + + } + + private void createValueChangeListener(String category) { + + createBooleanAction("Value change listener", category, false, + valueChangeListenerCommand); + } + + private void createReadOnlyStatusChangeListener(String category) { + + createBooleanAction("Read only status change listener", category, false, + readonlyStatusChangeListenerCommand); + } + + protected Command valueChangeListenerCommand = new Command() { + + @Override + public void execute(T c, Boolean value, Object data) { + if (value) { + c.addListener( + (ValueChangeListener) LegacyAbstractFieldTest.this); + } else { + c.removeListener( + (ValueChangeListener) LegacyAbstractFieldTest.this); + } + } + }; + protected Command readonlyStatusChangeListenerCommand = new Command() { + + @Override + public void execute(T c, Boolean value, Object data) { + if (value) { + c.addListener( + (ReadOnlyStatusChangeListener) LegacyAbstractFieldTest.this); + } else { + c.removeListener( + (ReadOnlyStatusChangeListener) LegacyAbstractFieldTest.this); + } + } + }; + + protected Command setValueCommand = new Command() { + + @Override + public void execute(T c, Object value, Object data) { + c.setValue(value); + } + }; + + @Override + public void valueChange(com.vaadin.data.Property.ValueChangeEvent event) { + log(event.getClass().getSimpleName() + ", new value: " + + getValue(event.getProperty())); + } + + @SuppressWarnings({ "rawtypes", "unchecked" }) + private String getValue(Property property) { + Object o = property.getValue(); + if (o instanceof Collection && sortValueChanges) { + // Sort collections to avoid problems with values printed in + // different order + try { + ArrayList c = new ArrayList( + (Collection) o); + Collections.sort(c); + o = c; + } catch (Exception e) { + // continue with unsorted if sorting fails for some reason + log("Exception while sorting value: " + e.getMessage()); + } + } + + // Distinguish between null and 'null' + String value = "null"; + if (o != null) { + if (o instanceof Date) { + Date d = (Date) o; + // Dec 31, 2068 23:09:26.531 + String pattern = "MMM d, yyyy HH:mm:ss.SSS"; + SimpleDateFormat format = new SimpleDateFormat(pattern, + new Locale("en", "US")); + value = format.format(d); + } else { + value = "'" + o.toString() + "'"; + } + } + + return value; + + } + + @Override + public void readOnlyStatusChange(ReadOnlyStatusChangeEvent event) { + log(event.getClass().getSimpleName()); + } + + protected void createSetTextValueAction(String category) { + String subCategory = "Set text value"; + createCategory(subCategory, category); + List values = new ArrayList(); + 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"); + + createClickAction("(empty string)", subCategory, setValueCommand, ""); + createClickAction("(null)", subCategory, setValueCommand, null); + for (String value : values) { + createClickAction(value, subCategory, setValueCommand, value); + } + } + +} 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 implements +public class CheckBoxes2 extends LegacyAbstractFieldTest 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 extends AbstractFieldTest { +public class DateFieldTest extends LegacyAbstractFieldTest { @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
{ +public class FormTest extends LegacyAbstractFieldTest { private Command footerWidthCommand = new Command() { 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 { +public class ProgressBarGenericTest extends LegacyAbstractFieldTest { private Command indeterminate = new Command() { 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 { +public class ProgressIndicatorTest extends LegacyAbstractFieldTest { ProgressIndicator progress = new ProgressIndicator(); Command setValueCommand = new Command() { 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 { +public class RichTextAreaTest extends LegacyAbstractFieldTest { @Override protected Class 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 extends - AbstractFieldTest implements ItemClickListener { + LegacyAbstractFieldTest 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 { +public class SliderTest extends LegacyAbstractFieldTest { private Command minCommand = new Command() { @Override -- cgit v1.2.3