Allow overriding settings menu items

svn changeset:17189/svn branch:6.5

2 files changed, 44 insertions, 6 deletions

diff --git a/tests/src/com/vaadin/tests/components/AbstractComponentTest.java b/tests/src/com/vaadin/tests/components/AbstractComponentTest.java
index 47a1d6c905..b00ca3025b 100644
--- a/tests/src/com/vaadin/tests/components/AbstractComponentTest.java
+++ b/tests/src/com/vaadin/tests/components/AbstractComponentTest.java
@@ -92,12 +92,22 @@ public abstract class AbstractComponentTest<T extends AbstractComponent>
         menu.setDebugId("menu");

         mainMenu = menu.addItem("Component", null);

         settingsMenu = menu.addItem("Settings", null);

-        createSettingsMenu();

+        populateSettingsMenu(settingsMenu);

 

         return menu;

     }

 

-    private void createSettingsMenu() {

+    /**

+     * Override to add items to the "settings" menu.

+     * 

+     * NOTE, Call super class first to preserve current order. If you override

+     * this in a class and another class overrides it you might break tests

+     * because the wrong items will be selected.

+     * 

+     * @param settingsMenu

+     */

+    protected void populateSettingsMenu(MenuItem settingsMenu) {

+

         MenuItem showEventLog = settingsMenu.addItem("Show event log",

                 new MenuBar.Command() {

 

diff --git a/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java b/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java
index dc0f01f714..79ec0d1bf6 100644
--- a/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java
+++ b/tests/src/com/vaadin/tests/components/abstractfield/AbstractFieldTest.java
@@ -9,6 +9,7 @@ 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;

@@ -20,6 +21,8 @@ import com.vaadin.event.FieldEvents.FocusListener;
 import com.vaadin.event.FieldEvents.FocusNotifier;

 import com.vaadin.tests.components.AbstractComponentTest;

 import com.vaadin.ui.AbstractField;

+import com.vaadin.ui.MenuBar;

+import com.vaadin.ui.MenuBar.MenuItem;

 

 public abstract class AbstractFieldTest<T extends AbstractField> extends

         AbstractComponentTest<T> implements ValueChangeListener,

@@ -50,6 +53,25 @@ public abstract class AbstractFieldTest<T extends AbstractField> extends
 

     }

 

+    @Override

+    protected void populateSettingsMenu(MenuItem settingsMenu) {

+        super.populateSettingsMenu(settingsMenu);

+

+        if (AbstractField.class.isAssignableFrom(getTestClass())) {

+            MenuItem abstractField = settingsMenu

+                    .addItem("AbstractField", null);

+            abstractField.addItem("Show value", new MenuBar.Command() {

+

+                public void menuSelected(MenuItem selectedItem) {

+                    for (T a : getTestComponents()) {

+                        log(a.getClass().getSimpleName() + " value: "

+                                + getValue(a));

+                    }

+                }

+            });

+        }

+    }

+

     private void createRequiredErrorSelect(String category) {

         LinkedHashMap<String, String> options = new LinkedHashMap<String, String>();

         options.put("-", null);

@@ -141,9 +163,14 @@ public abstract class AbstractFieldTest<T extends AbstractField> extends
         }

     };

 

-    @SuppressWarnings({ "rawtypes", "unchecked" })

     public void valueChange(com.vaadin.data.Property.ValueChangeEvent event) {

-        Object o = event.getProperty().getValue();

+        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) {

             // Sort collections to avoid problems with values printed in

             // different order

@@ -173,8 +200,9 @@ public abstract class AbstractFieldTest<T extends AbstractField> extends
             }

         }

 

-        log(event.getClass().getSimpleName() + ", new value: " + value);

-    };

+        return value;

+

+    }

 

     public void readOnlyStatusChange(ReadOnlyStatusChangeEvent event) {

         log(event.getClass().getSimpleName());