From dc6a2e01644c56a39b02507b7a3bf3529ad7d132 Mon Sep 17 00:00:00 2001
From: Henri Sara <hesara@vaadin.com>
Date: Thu, 1 Dec 2011 11:03:20 +0200
Subject: [PATCH] Minor fixes to data binding tests based on review.

---
 .../com/vaadin/tests/data/bean/Country.java   |  4 ++--
 .../com/vaadin/tests/data/bean/Sex.java       |  2 +-
 .../DateFieldBasedOnTextField.java            | 23 -------------------
 .../components/table/DoublesInTable.java      | 17 +++++++-------
 4 files changed, 12 insertions(+), 34 deletions(-)
 delete mode 100644 tests/testbench/com/vaadin/tests/components/abstractfield/DateFieldBasedOnTextField.java

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 e720a784cc..77192e3057 100644
--- 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;
 
 public enum Country {
 
-    FINLAND("Finland"), SWEDEN("Sweden"), USA("USA"), RUSSIA("Russia"), HOLLAND(
-            "Holland"), SOUTH_AFRICA("South Africa");
+    FINLAND("Finland"), SWEDEN("Sweden"), USA("USA"), RUSSIA("Russia"), NETHERLANDS(
+            "Netherlands"), SOUTH_AFRICA("South Africa");
 
     private String name;
 
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 a2dc82fdb5..9fd23d65c9 100644
--- 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;
 
 public enum Sex {
-    MALE("Male"), FEMALE("Female"), UNKNOWN("WTF?");
+    MALE("Male"), FEMALE("Female"), UNKNOWN("Unknown");
 
     private String stringRepresentation;
 
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
index 69a5bb17ca..0000000000
--- a/tests/testbench/com/vaadin/tests/components/abstractfield/DateFieldBasedOnTextField.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.vaadin.tests.components.abstractfield;
-
-import java.util.Date;
-
-import com.vaadin.data.util.ObjectProperty;
-import com.vaadin.ui.TextField;
-
-public class DateFieldBasedOnTextField extends AbstractComponentDataBindingTest {
-
-    private TextField tf;
-
-    @Override
-    protected void createFields() {
-        tf = new TextField("Enter a date");
-        tf.setWidth("200px");
-        addComponent(tf);
-        tf.setImmediate(true);
-        ObjectProperty<Date> property = new ObjectProperty<Date>(new Date());
-        tf.setPropertyDataSource(property);
-
-    }
-
-}
diff --git a/tests/testbench/com/vaadin/tests/components/table/DoublesInTable.java b/tests/testbench/com/vaadin/tests/components/table/DoublesInTable.java
index 5a8c49ff33..e9ba5ff579 100644
--- 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 {
 
             public Sex convertFromTargetToSource(String value, Locale locale)
                     throws com.vaadin.data.util.converter.Converter.ConversionException {
-                // TODO
+                // not used in this test - Table only converts from source to
+                // target
                 return null;
             }
 
@@ -170,11 +171,9 @@ public class DoublesInTable extends TestBase {
         t.setConverter("deceased", new Converter<Boolean, String>() {
 
             public Boolean convertFromTargetToSource(String value, Locale locale) {
-                if ("-".equals(value)) {
-                    return true;
-                } else {
-                    return false;
-                }
+                // not used in this test - Table only converts from source to
+                // target
+                return null;
             }
 
             public String convertFromSourceToTarget(Boolean value, Locale locale) {
@@ -197,7 +196,8 @@ public class DoublesInTable extends TestBase {
 
             public Integer convertFromTargetToSource(String value, Locale locale)
                     throws com.vaadin.data.util.converter.Converter.ConversionException {
-                // TODO Auto-generated method stub
+                // not used in this test - Table only converts from source to
+                // target
                 return null;
             }
 
@@ -229,7 +229,8 @@ public class DoublesInTable extends TestBase {
 
             public Address convertFromTargetToSource(String value, Locale locale)
                     throws ConversionException {
-                // TODO Auto-generated method stub
+                // not used in this test - Table only converts from source to
+                // target
                 return null;
             }
 
-- 
2.39.5