1 files changed, 95 insertions, 0 deletions
diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1230.java b/src/com/itmill/toolkit/tests/tickets/Ticket1230.java
new file mode 100644
index 0000000000..16b35bdc3a
--- /dev/null
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1230.java
@@ -0,0 +1,95 @@
+package com.itmill.toolkit.tests.tickets;
+
+import com.itmill.toolkit.Application;
+import com.itmill.toolkit.data.Item;
+import com.itmill.toolkit.ui.Button;
+import com.itmill.toolkit.ui.GridLayout;
+import com.itmill.toolkit.ui.Select;
+import com.itmill.toolkit.ui.Window;
+import com.itmill.toolkit.ui.Button.ClickEvent;
+import com.itmill.toolkit.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;
+
+    public void init() {
+        Window w = new Window(getClass().getSimpleName());
+        setMainWindow(w);
+
+        GridLayout layout = new GridLayout(3, 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 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 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;
+    }
+
+}