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

svn changeset:9406/svn branch:6.2

diff --git a/tests/src/com/vaadin/tests/components/select/NullSelectionItemId.java b/tests/src/com/vaadin/tests/components/select/NullSelectionItemId.java
index f42995a6016b3217eb960d283f6d706ee613aacf..bff840f42179c28b9d06cb0e9b0ec33d1570a7a6 100644 (file)
--- 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);\r
         addComponent(button);\r
 \r
+        button = new Button(\r
+                "Select null with select(NULL_ITEM_ID) (should make value null)",\r
+                new Button.ClickListener() {\r
+                    public void buttonClick(ClickEvent event) {\r
+                        mySelect.select(NULL_ITEM_ID);\r
+                    }\r
+                });\r
+\r
+        addComponent(button);\r
+\r
+        button = new Button(\r
+                "Select null with setValue(null) (should make value null)",\r
+                new Button.ClickListener() {\r
+                    public void buttonClick(ClickEvent event) {\r
+                        mySelect.setValue(null);\r
+                    }\r
+                });\r
+\r
+        addComponent(button);\r
+\r
     }\r
 \r
     public void buttonClick(ClickEvent event) {\r
-        this.getMainWindow().showNotification(\r
+        getMainWindow().showNotification(\r
                 "mySelect.getValue() returns: " + mySelect.getValue());\r
     }\r
 \r
     @Override\r
     protected String getDescription() {\r
         return "Steps to reproduce:<br />"\r
-                + "<ol><li>Click the button -> value is the item id \"Null item id\".</li>"\r
+                + "<ol><li>Click the button -> value is the item id \"Null item id\" (should be null).</li>"\r
                 + "<li>Select the \"Another item\".</li>"\r
                 + "<li>Select back the first item.</li>"\r
-                + "<li>Click the button -> the value is null</li></ol>";\r
+                + "<li>Click the button -> the value is null (as it should)</li></ol>";\r
     }\r
 \r
     @Override\r

diff --git a/tests/src/com/vaadin/tests/tickets/Ticket1230.java b/tests/src/com/vaadin/tests/tickets/Ticket1230.java
index 233dd3aae8c9467327a8e7dfdeb7964405470001..b77c21a4a600ba80913746956da51e3b0322b497 100644 (file)
--- 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;\r
-\r
-import com.vaadin.Application;\r
-import com.vaadin.data.Item;\r
-import com.vaadin.ui.Button;\r
-import com.vaadin.ui.GridLayout;\r
-import com.vaadin.ui.Select;\r
-import com.vaadin.ui.Window;\r
-import com.vaadin.ui.Button.ClickEvent;\r
-import com.vaadin.ui.Button.ClickListener;\r
-\r
-public class Ticket1230 extends Application {\r
-\r
-    private static final Object PROPERTY_ID = new Object();\r
-    private static final Object NULL_ITEM_ID = new Object();\r
-    private Select selectWithoutNullItem;\r
-    private Select selectWithNullItem;\r
-\r
-    @Override\r
-    public void init() {\r
-        Window w = new Window(getClass().getName());\r
-        setMainWindow(w);\r
-\r
-        GridLayout layout = new GridLayout(5, 5);\r
-        w.setLayout(layout);\r
-\r
-        layout.setSpacing(true);\r
-\r
-        {\r
-            selectWithoutNullItem = createSelect();\r
-\r
-            layout.addComponent(selectWithoutNullItem);\r
-            Button b = new Button("Select NULL_PROPERTY", new ClickListener() {\r
-\r
-                public void buttonClick(ClickEvent event) {\r
-                    selectWithoutNullItem.select(NULL_ITEM_ID);\r
-\r
-                }\r
-            });\r
-            layout.addComponent(b);\r
-            b = new Button("Select 1", new ClickListener() {\r
-\r
-                public void buttonClick(ClickEvent event) {\r
-                    selectWithoutNullItem.select("1");\r
-\r
-                }\r
-            });\r
-            layout.addComponent(b);\r
-            b = new Button("Select 2", new ClickListener() {\r
-\r
-                public void buttonClick(ClickEvent event) {\r
-                    selectWithoutNullItem.select("2");\r
-\r
-                }\r
-            });\r
-            layout.addComponent(b);\r
-\r
-            b = new Button("Select null", new ClickListener() {\r
-\r
-                public void buttonClick(ClickEvent event) {\r
-                    selectWithoutNullItem.select(null);\r
-\r
-                }\r
-            });\r
-            layout.addComponent(b);\r
-        }\r
-\r
-        {\r
-            selectWithNullItem = createSelect();\r
-            Item nullItem = selectWithNullItem.addItem(NULL_ITEM_ID);\r
-            nullItem.getItemProperty(PROPERTY_ID).setValue("NULL");\r
-            selectWithNullItem.setNullSelectionItemId(NULL_ITEM_ID);\r
-\r
-            layout.addComponent(selectWithNullItem);\r
-            Button b = new Button("Select NULL_PROPERTY", new ClickListener() {\r
-\r
-                public void buttonClick(ClickEvent event) {\r
-                    selectWithNullItem.select(NULL_ITEM_ID);\r
-\r
-                }\r
-            });\r
-            layout.addComponent(b);\r
-\r
-            b = new Button("Select 1", new ClickListener() {\r
-\r
-                public void buttonClick(ClickEvent event) {\r
-                    selectWithNullItem.select("1");\r
-\r
-                }\r
-            });\r
-            layout.addComponent(b);\r
-            b = new Button("Select 2", new ClickListener() {\r
-\r
-                public void buttonClick(ClickEvent event) {\r
-                    selectWithNullItem.select("2");\r
-\r
-                }\r
-            });\r
-            layout.addComponent(b);\r
-\r
-            b = new Button("Select null", new ClickListener() {\r
-\r
-                public void buttonClick(ClickEvent event) {\r
-                    selectWithNullItem.select(null);\r
-\r
-                }\r
-            });\r
-            layout.addComponent(b);\r
-\r
-        }\r
-    }\r
-\r
-    private Select createSelect() {\r
-        Select select = new Select();\r
-        select.setMultiSelect(false);\r
-        select.addContainerProperty(PROPERTY_ID, String.class, "");\r
-        select.setItemCaptionPropertyId(PROPERTY_ID);\r
-\r
-        Item item1 = select.addItem("1");\r
-        item1.getItemProperty(PROPERTY_ID).setValue("1");\r
-        Item item2 = select.addItem("2");\r
-        item2.getItemProperty(PROPERTY_ID).setValue("2");\r
-\r
-        select.setNullSelectionAllowed(true);\r
-\r
-        return select;\r
-    }\r
-\r
-}\r
+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());
+
+    }
+
+}