From ad9c3506e752534f72814da2782fc87db55b49c0 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Fri, 14 Jun 2013 13:20:00 +0300
Subject: Fixed test issues with type=null (#11895)

Change-Id: I1618191f534ef75048dbae95564ef30a320114a4
---
 .../com/vaadin/tests/data/converter/TestStringToBooleanConverter.java   | 2 +-
 .../src/com/vaadin/tests/data/converter/TestStringToDateConverter.java  | 2 +-
 .../com/vaadin/tests/data/converter/TestStringToDoubleConverter.java    | 2 +-
 .../src/com/vaadin/tests/data/converter/TestStringToFloatConverter.java | 2 +-
 .../com/vaadin/tests/data/converter/TestStringToIntegerConverter.java   | 2 +-
 .../com/vaadin/tests/data/converter/TestStringToNumberConverter.java    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/server/tests/src/com/vaadin/tests/data/converter/TestStringToBooleanConverter.java b/server/tests/src/com/vaadin/tests/data/converter/TestStringToBooleanConverter.java
index f236bb4000..7be922a63a 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/TestStringToBooleanConverter.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/TestStringToBooleanConverter.java
@@ -9,7 +9,7 @@ public class TestStringToBooleanConverter extends TestCase {
     StringToBooleanConverter converter = new StringToBooleanConverter();
 
     public void testNullConversion() {
-        assertEquals(null, converter.convertToModel(null, null, null));
+        assertEquals(null, converter.convertToModel(null, Boolean.class, null));
     }
 
     public void testEmptyStringConversion() {
diff --git a/server/tests/src/com/vaadin/tests/data/converter/TestStringToDateConverter.java b/server/tests/src/com/vaadin/tests/data/converter/TestStringToDateConverter.java
index 59314bd5ee..eb0e1461b2 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/TestStringToDateConverter.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/TestStringToDateConverter.java
@@ -12,7 +12,7 @@ public class TestStringToDateConverter extends TestCase {
     StringToDateConverter converter = new StringToDateConverter();
 
     public void testNullConversion() {
-        assertEquals(null, converter.convertToModel(null, null, null));
+        assertEquals(null, converter.convertToModel(null, Date.class, null));
     }
 
     public void testEmptyStringConversion() {
diff --git a/server/tests/src/com/vaadin/tests/data/converter/TestStringToDoubleConverter.java b/server/tests/src/com/vaadin/tests/data/converter/TestStringToDoubleConverter.java
index 739f9b7d5a..14691bd922 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/TestStringToDoubleConverter.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/TestStringToDoubleConverter.java
@@ -9,7 +9,7 @@ public class TestStringToDoubleConverter extends TestCase {
     StringToDoubleConverter converter = new StringToDoubleConverter();
 
     public void testNullConversion() {
-        assertEquals(null, converter.convertToModel(null, null, null));
+        assertEquals(null, converter.convertToModel(null, Double.class, null));
     }
 
     public void testEmptyStringConversion() {
diff --git a/server/tests/src/com/vaadin/tests/data/converter/TestStringToFloatConverter.java b/server/tests/src/com/vaadin/tests/data/converter/TestStringToFloatConverter.java
index 3bb2b3649e..6721a92b1a 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/TestStringToFloatConverter.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/TestStringToFloatConverter.java
@@ -9,7 +9,7 @@ public class TestStringToFloatConverter extends TestCase {
     StringToFloatConverter converter = new StringToFloatConverter();
 
     public void testNullConversion() {
-        assertEquals(null, converter.convertToModel(null, null, null));
+        assertEquals(null, converter.convertToModel(null, Float.class, null));
     }
 
     public void testEmptyStringConversion() {
diff --git a/server/tests/src/com/vaadin/tests/data/converter/TestStringToIntegerConverter.java b/server/tests/src/com/vaadin/tests/data/converter/TestStringToIntegerConverter.java
index 7f247b791f..c73853578e 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/TestStringToIntegerConverter.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/TestStringToIntegerConverter.java
@@ -9,7 +9,7 @@ public class TestStringToIntegerConverter extends TestCase {
     StringToIntegerConverter converter = new StringToIntegerConverter();
 
     public void testNullConversion() {
-        assertEquals(null, converter.convertToModel(null, null, null));
+        assertEquals(null, converter.convertToModel(null, Integer.class, null));
     }
 
     public void testEmptyStringConversion() {
diff --git a/server/tests/src/com/vaadin/tests/data/converter/TestStringToNumberConverter.java b/server/tests/src/com/vaadin/tests/data/converter/TestStringToNumberConverter.java
index 9c322cd301..66fc4f6532 100644
--- a/server/tests/src/com/vaadin/tests/data/converter/TestStringToNumberConverter.java
+++ b/server/tests/src/com/vaadin/tests/data/converter/TestStringToNumberConverter.java
@@ -9,7 +9,7 @@ public class TestStringToNumberConverter extends TestCase {
     StringToNumberConverter converter = new StringToNumberConverter();
 
     public void testNullConversion() {
-        assertEquals(null, converter.convertToModel(null, null, null));
+        assertEquals(null, converter.convertToModel(null, Number.class, null));
     }
 
     public void testEmptyStringConversion() {
-- 
cgit v1.2.3