Minor fixes to data binding tests based on review.

diff --git a/tests/server-side/com/vaadin/tests/data/bean/Country.java b/tests/server-side/com/vaadin/tests/data/bean/Country.java
index e720a784cc028aa8592266c3c01a24f1cafe0dee..77192e30572533eb979baf8b9afc7496218006c5 100644 (file)
--- a/tests/server-side/com/vaadin/tests/data/bean/Country.java
+++ b/tests/server-side/com/vaadin/tests/data/bean/Country.java
@@ -2,8 +2,8 @@ package com.vaadin.tests.data.bean;
 \r
 public enum Country {\r
 \r
-    FINLAND("Finland"), SWEDEN("Sweden"), USA("USA"), RUSSIA("Russia"), HOLLAND(\r
-            "Holland"), SOUTH_AFRICA("South Africa");\r
+    FINLAND("Finland"), SWEDEN("Sweden"), USA("USA"), RUSSIA("Russia"), NETHERLANDS(\r
+            "Netherlands"), SOUTH_AFRICA("South Africa");\r
 \r
     private String name;\r
 \r

diff --git a/tests/server-side/com/vaadin/tests/data/bean/Sex.java b/tests/server-side/com/vaadin/tests/data/bean/Sex.java
index a2dc82fdb540a22c0271f5c9d6c43e006934a210..9fd23d65c96146092fc6f829b2c3cf9999689ac0 100644 (file)
--- a/tests/server-side/com/vaadin/tests/data/bean/Sex.java
+++ b/tests/server-side/com/vaadin/tests/data/bean/Sex.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.data.bean;\r
 \r
 public enum Sex {\r
-    MALE("Male"), FEMALE("Female"), UNKNOWN("WTF?");\r
+    MALE("Male"), FEMALE("Female"), UNKNOWN("Unknown");\r
 \r
     private String stringRepresentation;\r
 \r

diff --git a/tests/testbench/com/vaadin/tests/components/abstractfield/DateFieldBasedOnTextField.java b/tests/testbench/com/vaadin/tests/components/abstractfield/DateFieldBasedOnTextField.java
deleted file mode 100644 (file)
index 69a5bb1..0000000
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/DateFieldBasedOnTextField.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.vaadin.tests.components.abstractfield;\r
-\r
-import java.util.Date;\r
-\r
-import com.vaadin.data.util.ObjectProperty;\r
-import com.vaadin.ui.TextField;\r
-\r
-public class DateFieldBasedOnTextField extends AbstractComponentDataBindingTest {\r
-\r
-    private TextField tf;\r
-\r
-    @Override\r
-    protected void createFields() {\r
-        tf = new TextField("Enter a date");\r
-        tf.setWidth("200px");\r
-        addComponent(tf);\r
-        tf.setImmediate(true);\r
-        ObjectProperty<Date> property = new ObjectProperty<Date>(new Date());\r
-        tf.setPropertyDataSource(property);\r
-\r
-    }\r
-\r
-}\r

diff --git a/tests/testbench/com/vaadin/tests/components/table/DoublesInTable.java b/tests/testbench/com/vaadin/tests/components/table/DoublesInTable.java
index 5a8c49ff33186a876ce94e8ba1d0299dc557d419..e9ba5ff5799bef8c98c91ce8209a896bc18c46c9 100644 (file)
--- a/tests/testbench/com/vaadin/tests/components/table/DoublesInTable.java
+++ b/tests/testbench/com/vaadin/tests/components/table/DoublesInTable.java
@@ -147,7 +147,8 @@ public class DoublesInTable extends TestBase {
 \r
             public Sex convertFromTargetToSource(String value, Locale locale)\r
                     throws com.vaadin.data.util.converter.Converter.ConversionException {\r
-                // TODO\r
+                // not used in this test - Table only converts from source to\r
+                // target\r
                 return null;\r
             }\r
 \r
@@ -170,11 +171,9 @@ public class DoublesInTable extends TestBase {
         t.setConverter("deceased", new Converter<Boolean, String>() {\r
 \r
             public Boolean convertFromTargetToSource(String value, Locale locale) {\r
-                if ("-".equals(value)) {\r
-                    return true;\r
-                } else {\r
-                    return false;\r
-                }\r
+                // not used in this test - Table only converts from source to\r
+                // target\r
+                return null;\r
             }\r
 \r
             public String convertFromSourceToTarget(Boolean value, Locale locale) {\r
@@ -197,7 +196,8 @@ public class DoublesInTable extends TestBase {
 \r
             public Integer convertFromTargetToSource(String value, Locale locale)\r
                     throws com.vaadin.data.util.converter.Converter.ConversionException {\r
-                // TODO Auto-generated method stub\r
+                // not used in this test - Table only converts from source to\r
+                // target\r
                 return null;\r
             }\r
 \r
@@ -229,7 +229,8 @@ public class DoublesInTable extends TestBase {
 \r
             public Address convertFromTargetToSource(String value, Locale locale)\r
                     throws ConversionException {\r
-                // TODO Auto-generated method stub\r
+                // not used in this test - Table only converts from source to\r
+                // target\r
                 return null;\r
             }\r
 \r