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 1e952af775ea95e89c24dd06ab8281d9570d2e46..ece1235f225e014c64b299820cd5f254f33318c5 100644 (file)
--- 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);\r
         s.setNullSelectionAllowed(false);\r
         TestPojo myPojo = new TestPojo();\r
-        s.setPropertyDataSource(new MethodProperty(myPojo, "id"));\r
+        Select selectToBeBoundToExternalDatasource = s;\r
         s.addValidator(new EmptyStringValidator(\r
                 "Selection required for test-field"));\r
         listOfAllFields.add(s);\r
@@ -43,15 +43,20 @@ public class Ticket1804 extends com.itmill.toolkit.Application {
         for (Iterator i = listOfAllFields.iterator(); i.hasNext();) {\r
             s = (Select) i.next();\r
             main.addComponent(s);\r
-            s.addItem("<null>");\r
             s.addItem("foo");\r
             s.addItem("");\r
             s.addItem("bar");\r
-            s.setNullSelectionItemId("<null>");\r
+            if (s.isNullSelectionAllowed()) {\r
+                s.addItem("<null>");\r
+                s.setNullSelectionItemId("<null>");\r
+            }\r
             s.setImmediate(true);\r
             s.setRequired(true);\r
         }\r
 \r
+        selectToBeBoundToExternalDatasource\r
+                .setPropertyDataSource(new MethodProperty(myPojo, "id"));\r
+\r
         Button checkValidity = new Button("Check validity of the fields");\r
         main.addComponent(checkValidity);\r
         checkValidity.addListener(new Button.ClickListener() {\r
@@ -78,7 +83,7 @@ public class Ticket1804 extends com.itmill.toolkit.Application {
         });\r
     }\r
 \r
-    class TestPojo {\r
+    public class TestPojo {\r
         String id = "";\r
 \r
         public String getId() {\r