merged updated test case (by hand due source tree refactoring)

svn changeset:9406/svn branch:6.2

2 files changed, 174 insertions, 132 deletions

diff --git a/tests/src/com/vaadin/tests/components/select/NullSelectionItemId.java b/tests/src/com/vaadin/tests/components/select/NullSelectionItemId.java
index f42995a601..bff840f421 100644
--- a/tests/src/com/vaadin/tests/components/select/NullSelectionItemId.java
+++ b/tests/src/com/vaadin/tests/components/select/NullSelectionItemId.java
@@ -33,20 +33,40 @@ public class NullSelectionItemId extends TestBase implements ClickListener {
         addComponent(mySelect);

         addComponent(button);

 

+        button = new Button(

+                "Select null with select(NULL_ITEM_ID) (should make value null)",

+                new Button.ClickListener() {

+                    public void buttonClick(ClickEvent event) {

+                        mySelect.select(NULL_ITEM_ID);

+                    }

+                });

+

+        addComponent(button);

+

+        button = new Button(

+                "Select null with setValue(null) (should make value null)",

+                new Button.ClickListener() {

+                    public void buttonClick(ClickEvent event) {

+                        mySelect.setValue(null);

+                    }

+                });

+

+        addComponent(button);

+

     }

 

     public void buttonClick(ClickEvent event) {

-        this.getMainWindow().showNotification(

+        getMainWindow().showNotification(

                 "mySelect.getValue() returns: " + mySelect.getValue());

     }

 

     @Override

     protected String getDescription() {

         return "Steps to reproduce:<br />"

-                + "<ol><li>Click the button -> value is the item id \"Null item id\".</li>"

+                + "<ol><li>Click the button -> value is the item id \"Null item id\" (should be null).</li>"

                 + "<li>Select the \"Another item\".</li>"

                 + "<li>Select back the first item.</li>"

-                + "<li>Click the button -> the value is null</li></ol>";

+                + "<li>Click the button -> the value is null (as it should)</li></ol>";

     }

 

     @Override

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1230.java b/tests/src/com/vaadin/tests/tickets/Ticket1230.java
index 233dd3aae8..b77c21a4a6 100644
--- a/tests/src/com/vaadin/tests/tickets/Ticket1230.java
+++ b/tests/src/com/vaadin/tests/tickets/Ticket1230.java
@@ -1,129 +1,151 @@
-package com.vaadin.tests.tickets;

-

-import com.vaadin.Application;

-import com.vaadin.data.Item;

-import com.vaadin.ui.Button;

-import com.vaadin.ui.GridLayout;

-import com.vaadin.ui.Select;

-import com.vaadin.ui.Window;

-import com.vaadin.ui.Button.ClickEvent;

-import com.vaadin.ui.Button.ClickListener;

-

-public class Ticket1230 extends Application {

-

-    private static final Object PROPERTY_ID = new Object();

-    private static final Object NULL_ITEM_ID = new Object();

-    private Select selectWithoutNullItem;

-    private Select selectWithNullItem;

-

-    @Override

-    public void init() {

-        Window w = new Window(getClass().getName());

-        setMainWindow(w);

-

-        GridLayout layout = new GridLayout(5, 5);

-        w.setLayout(layout);

-

-        layout.setSpacing(true);

-

-        {

-            selectWithoutNullItem = createSelect();

-

-            layout.addComponent(selectWithoutNullItem);

-            Button b = new Button("Select NULL_PROPERTY", new ClickListener() {

-

-                public void buttonClick(ClickEvent event) {

-                    selectWithoutNullItem.select(NULL_ITEM_ID);

-

-                }

-            });

-            layout.addComponent(b);

-            b = new Button("Select 1", new ClickListener() {

-

-                public void buttonClick(ClickEvent event) {

-                    selectWithoutNullItem.select("1");

-

-                }

-            });

-            layout.addComponent(b);

-            b = new Button("Select 2", new ClickListener() {

-

-                public void buttonClick(ClickEvent event) {

-                    selectWithoutNullItem.select("2");

-

-                }

-            });

-            layout.addComponent(b);

-

-            b = new Button("Select null", new ClickListener() {

-

-                public void buttonClick(ClickEvent event) {

-                    selectWithoutNullItem.select(null);

-

-                }

-            });

-            layout.addComponent(b);

-        }

-

-        {

-            selectWithNullItem = createSelect();

-            Item nullItem = selectWithNullItem.addItem(NULL_ITEM_ID);

-            nullItem.getItemProperty(PROPERTY_ID).setValue("NULL");

-            selectWithNullItem.setNullSelectionItemId(NULL_ITEM_ID);

-

-            layout.addComponent(selectWithNullItem);

-            Button b = new Button("Select NULL_PROPERTY", new ClickListener() {

-

-                public void buttonClick(ClickEvent event) {

-                    selectWithNullItem.select(NULL_ITEM_ID);

-

-                }

-            });

-            layout.addComponent(b);

-

-            b = new Button("Select 1", new ClickListener() {

-

-                public void buttonClick(ClickEvent event) {

-                    selectWithNullItem.select("1");

-

-                }

-            });

-            layout.addComponent(b);

-            b = new Button("Select 2", new ClickListener() {

-

-                public void buttonClick(ClickEvent event) {

-                    selectWithNullItem.select("2");

-

-                }

-            });

-            layout.addComponent(b);

-

-            b = new Button("Select null", new ClickListener() {

-

-                public void buttonClick(ClickEvent event) {

-                    selectWithNullItem.select(null);

-

-                }

-            });

-            layout.addComponent(b);

-

-        }

-    }

-

-    private Select createSelect() {

-        Select select = new Select();

-        select.setMultiSelect(false);

-        select.addContainerProperty(PROPERTY_ID, String.class, "");

-        select.setItemCaptionPropertyId(PROPERTY_ID);

-

-        Item item1 = select.addItem("1");

-        item1.getItemProperty(PROPERTY_ID).setValue("1");

-        Item item2 = select.addItem("2");

-        item2.getItemProperty(PROPERTY_ID).setValue("2");

-

-        select.setNullSelectionAllowed(true);

-

-        return select;

-    }

-

-}

+package com.vaadin.tests.tickets;
+
+import com.vaadin.Application;
+import com.vaadin.data.Item;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.GridLayout;
+import com.vaadin.ui.Select;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.Button.ClickEvent;
+import com.vaadin.ui.Button.ClickListener;
+
+public class Ticket1230 extends Application {
+
+    private static final Object PROPERTY_ID = new Object();
+    private static final Object NULL_ITEM_ID = new Object();
+    private Select selectWithoutNullItem;
+    private Select selectWithNullItem;
+
+    @Override
+    public void init() {
+        Window w = new Window(getClass().getName());
+        setMainWindow(w);
+
+        GridLayout layout = new GridLayout(5, 5);
+        w.setLayout(layout);
+
+        layout.setSpacing(true);
+
+        {
+            selectWithoutNullItem = createSelect();
+
+            layout.addComponent(selectWithoutNullItem);
+            Button b = new Button("Select NULL_PROPERTY", new ClickListener() {
+
+                public void buttonClick(ClickEvent event) {
+                    selectWithoutNullItem.select(NULL_ITEM_ID);
+                    printState();
+
+                }
+            });
+            layout.addComponent(b);
+            b = new Button("Select 1", new ClickListener() {
+
+                public void buttonClick(ClickEvent event) {
+                    selectWithoutNullItem.select("1");
+                    printState();
+
+                }
+            });
+            layout.addComponent(b);
+            b = new Button("Select 2", new ClickListener() {
+
+                public void buttonClick(ClickEvent event) {
+                    selectWithoutNullItem.select("2");
+                    printState();
+
+                }
+            });
+            layout.addComponent(b);
+
+            b = new Button("Select null", new ClickListener() {
+
+                public void buttonClick(ClickEvent event) {
+                    selectWithoutNullItem.select(null);
+                    printState();
+
+                }
+            });
+            layout.addComponent(b);
+        }
+
+        {
+            selectWithNullItem = createSelect();
+            Item nullItem = selectWithNullItem.addItem(NULL_ITEM_ID);
+            nullItem.getItemProperty(PROPERTY_ID).setValue("NULL");
+            selectWithNullItem.setNullSelectionItemId(NULL_ITEM_ID);
+
+            layout.addComponent(selectWithNullItem);
+            selectWithNullItem.setCaption("Select with null item id");
+            Button b = new Button("Select NULL_PROPERTY", new ClickListener() {
+
+                public void buttonClick(ClickEvent event) {
+                    selectWithNullItem.select(NULL_ITEM_ID);
+                    printState();
+
+                }
+            });
+            layout.addComponent(b);
+
+            b = new Button("Select 1", new ClickListener() {
+
+                public void buttonClick(ClickEvent event) {
+                    selectWithNullItem.select("1");
+                    printState();
+
+                }
+            });
+            layout.addComponent(b);
+            b = new Button("Select 2", new ClickListener() {
+
+                public void buttonClick(ClickEvent event) {
+                    selectWithNullItem.select("2");
+                    printState();
+                }
+            });
+            layout.addComponent(b);
+
+            b = new Button("Select null", new ClickListener() {
+
+                public void buttonClick(ClickEvent event) {
+                    selectWithNullItem.select(null);
+                    printState();
+                }
+            });
+            layout.addComponent(b);
+
+        }
+
+        w.addComponent(new Button("print select values",
+                new Button.ClickListener() {
+                    public void buttonClick(ClickEvent event) {
+                        printState();
+                    }
+                }));
+    }
+
+    private Select createSelect() {
+        Select select = new Select();
+        select.setMultiSelect(false);
+        select.addContainerProperty(PROPERTY_ID, String.class, "");
+        select.setItemCaptionPropertyId(PROPERTY_ID);
+
+        Item item1 = select.addItem("1");
+        item1.getItemProperty(PROPERTY_ID).setValue("1");
+        Item item2 = select.addItem("2");
+        item2.getItemProperty(PROPERTY_ID).setValue("2");
+
+        select.setNullSelectionAllowed(true);
+
+        return select;
+    }
+
+    void printState() {
+        System.out.println(" Select without null item "
+                + selectWithoutNullItem.getValue());
+        System.out.println(" Select with null item "
+                + selectWithNullItem.getValue());
+
+    }
+
+}