Added even more test alternatives to testcase #1804

svn changeset:4879/svn branch:trunk

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1804.java b/src/com/itmill/toolkit/tests/tickets/Ticket1804.java
index ece1235f225e014c64b299820cd5f254f33318c5..8baa289f55f255f7ce4331dc04271eac3bf79680 100644 (file)
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1804.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1804.java
@@ -25,19 +25,40 @@ public class Ticket1804 extends com.itmill.toolkit.Application {
 \r
         s = new Select("Select with null selection allowed; required=true");\r
         s.setNullSelectionAllowed(true);\r
+        s.setRequired(true);\r
         listOfAllFields.add(s);\r
 \r
         s = new Select("Select with null selection NOT allowed; required=true");\r
         s.setNullSelectionAllowed(false);\r
+        s.setRequired(true);\r
         listOfAllFields.add(s);\r
 \r
         s = new Select("Testcase from the ticket #1804");\r
-        s.setWidth(190);\r
         s.setNullSelectionAllowed(false);\r
-        TestPojo myPojo = new TestPojo();\r
-        Select selectToBeBoundToExternalDatasource = s;\r
+        s.setPropertyDataSource(new MethodProperty(new TestPojo(), "id"));\r
         s.addValidator(new EmptyStringValidator(\r
                 "Selection required for test-field"));\r
+        s.setRequired(true);\r
+        listOfAllFields.add(s);\r
+\r
+        s = new Select("Testcase from the ticket #1804, but without validator");\r
+        s.setNullSelectionAllowed(false);\r
+        s.setPropertyDataSource(new MethodProperty(new TestPojo(), "id"));\r
+        s.setRequired(true);\r
+        listOfAllFields.add(s);\r
+\r
+        s = new Select(\r
+                "Testcase from the ticket #1804, but with required=false");\r
+        s.setNullSelectionAllowed(false);\r
+        s.setPropertyDataSource(new MethodProperty(new TestPojo(), "id"));\r
+        s.addValidator(new EmptyStringValidator(\r
+                "Selection required for test-field"));\r
+        listOfAllFields.add(s);\r
+\r
+        s = new Select(\r
+                "Testcase from the ticket #1804, but without validator and with required=false");\r
+        s.setNullSelectionAllowed(false);\r
+        s.setPropertyDataSource(new MethodProperty(new TestPojo(), "id"));\r
         listOfAllFields.add(s);\r
 \r
         for (Iterator i = listOfAllFields.iterator(); i.hasNext();) {\r
@@ -51,12 +72,8 @@ public class Ticket1804 extends com.itmill.toolkit.Application {
                 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