From: Joonas Lehtinen <joonas.lehtinen@itmill.com>
Date: Sat, 14 Jun 2008 15:27:12 +0000 (+0000)
Subject: Added even more test alternatives to testcase #1804
X-Git-Tag: 6.7.0.beta1~4597
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6ce02e167c674e4a8a1fa59891bfc14d101b7025;p=vaadin-framework.git

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 ece1235f22..8baa289f55 100644
--- 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 {
 
         s = new Select("Select with null selection allowed; required=true");
         s.setNullSelectionAllowed(true);
+        s.setRequired(true);
         listOfAllFields.add(s);
 
         s = new Select("Select with null selection NOT allowed; required=true");
         s.setNullSelectionAllowed(false);
+        s.setRequired(true);
         listOfAllFields.add(s);
 
         s = new Select("Testcase from the ticket #1804");
-        s.setWidth(190);
         s.setNullSelectionAllowed(false);
-        TestPojo myPojo = new TestPojo();
-        Select selectToBeBoundToExternalDatasource = s;
+        s.setPropertyDataSource(new MethodProperty(new TestPojo(), "id"));
         s.addValidator(new EmptyStringValidator(
                 "Selection required for test-field"));
+        s.setRequired(true);
+        listOfAllFields.add(s);
+
+        s = new Select("Testcase from the ticket #1804, but without validator");
+        s.setNullSelectionAllowed(false);
+        s.setPropertyDataSource(new MethodProperty(new TestPojo(), "id"));
+        s.setRequired(true);
+        listOfAllFields.add(s);
+
+        s = new Select(
+                "Testcase from the ticket #1804, but with required=false");
+        s.setNullSelectionAllowed(false);
+        s.setPropertyDataSource(new MethodProperty(new TestPojo(), "id"));
+        s.addValidator(new EmptyStringValidator(
+                "Selection required for test-field"));
+        listOfAllFields.add(s);
+
+        s = new Select(
+                "Testcase from the ticket #1804, but without validator and with required=false");
+        s.setNullSelectionAllowed(false);
+        s.setPropertyDataSource(new MethodProperty(new TestPojo(), "id"));
         listOfAllFields.add(s);
 
         for (Iterator i = listOfAllFields.iterator(); i.hasNext();) {
@@ -51,12 +72,8 @@ public class Ticket1804 extends com.itmill.toolkit.Application {
                 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() {