From: Joonas Lehtinen <joonas.lehtinen@itmill.com>
Date: Sat, 14 Jun 2008 15:21:30 +0000 (+0000)
Subject: Fixed a bug in testcase 1804
X-Git-Tag: 6.7.0.beta1~4598
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7aa2ce12dda9ae4a2a1020d3e52669fb5545051c;p=vaadin-framework.git

Fixed a bug in testcase 1804

svn changeset:4878/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1804.java b/src/com/itmill/toolkit/tests/tickets/Ticket1804.java
index 1e952af775..ece1235f22 100644
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1804.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1804.java
@@ -35,7 +35,7 @@ public class Ticket1804 extends com.itmill.toolkit.Application {
         s.setWidth(190);
         s.setNullSelectionAllowed(false);
         TestPojo myPojo = new TestPojo();
-        s.setPropertyDataSource(new MethodProperty(myPojo, "id"));
+        Select selectToBeBoundToExternalDatasource = s;
         s.addValidator(new EmptyStringValidator(
                 "Selection required for test-field"));
         listOfAllFields.add(s);
@@ -43,15 +43,20 @@ public class Ticket1804 extends com.itmill.toolkit.Application {
         for (Iterator i = listOfAllFields.iterator(); i.hasNext();) {
             s = (Select) i.next();
             main.addComponent(s);
-            s.addItem("<null>");
             s.addItem("foo");
             s.addItem("");
             s.addItem("bar");
-            s.setNullSelectionItemId("<null>");
+            if (s.isNullSelectionAllowed()) {
+                s.addItem("<null>");
+                s.setNullSelectionItemId("<null>");
+            }
             s.setImmediate(true);
             s.setRequired(true);
         }
 
+        selectToBeBoundToExternalDatasource
+                .setPropertyDataSource(new MethodProperty(myPojo, "id"));
+
         Button checkValidity = new Button("Check validity of the fields");
         main.addComponent(checkValidity);
         checkValidity.addListener(new Button.ClickListener() {
@@ -78,7 +83,7 @@ public class Ticket1804 extends com.itmill.toolkit.Application {
         });
     }
 
-    class TestPojo {
+    public class TestPojo {
         String id = "";
 
         public String getId() {