Minor test refactoring

release-notes/VERSION

@@ -30,6 +30,9 @@ Project: jackson-databind
  (reported by Fabrizio C)
 #1434: Explicitly pass null on invoke calls with no arguments
  (contributed by Emiliano C)
+#1433: `ObjectMapper.convertValue()` with null does not consider null conversions
+  (`JsonDeserializer.getNullValue()`)
+ (contributed by jdmichal@github)
 #1444: Change `ObjectMapper.setSerializationInclusion()` to apply to content inclusion too
 
 2.8.5 (not yet released)

src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java

@@ -403,34 +403,4 @@ public void testDataInputViaMapper() throws Exception
                 .readTree(input);
         assertNotNull(n);
     }
-
-    // [databind#1433]
-    public void testConvertValueNullPrimitive() throws Exception
-    {
-        assertEquals(Integer.valueOf(0), MAPPER.convertValue(null, Integer.TYPE));
-    }
-
-    // [databind#1433]
-    public void testConvertValueNullPrimitive() throws Exception
-    {
-        assertEquals(Byte.valueOf((byte) 0), MAPPER.convertValue(null, Byte.TYPE));
-        assertEquals(Short.valueOf((short) 0), MAPPER.convertValue(null, Short.TYPE));
-        assertEquals(Integer.valueOf(0), MAPPER.convertValue(null, Integer.TYPE));
-        assertEquals(Long.valueOf(0L), MAPPER.convertValue(null, Long.TYPE));
-        assertEquals(Float.valueOf(0f), MAPPER.convertValue(null, Float.TYPE));
-        assertEquals(Double.valueOf(0d), MAPPER.convertValue(null, Double.TYPE));
-        assertEquals(Character.valueOf('\0'), MAPPER.convertValue(null, Character.TYPE));
-    }
-
-    // [databind#1433]
-    public void testConvertValueNullBoxed() throws Exception
-    {
-        assertNull(MAPPER.convertValue(null, Byte.class));
-        assertNull(MAPPER.convertValue(null, Short.class));
-        assertNull(MAPPER.convertValue(null, Integer.class));
-        assertNull(MAPPER.convertValue(null, Long.class));
-        assertNull(MAPPER.convertValue(null, Float.class));
-        assertNull(MAPPER.convertValue(null, Double.class));
-        assertNull(MAPPER.convertValue(null, Character.class));
-    }
 }

src/test/java/com/fasterxml/jackson/databind/convert/ScalarConversionTest.java

@@ -0,0 +1,34 @@
+package com.fasterxml.jackson.databind.convert;
+
+import com.fasterxml.jackson.databind.*;
+
+public class ScalarConversionTest extends BaseMapTest
+{
+    private final ObjectMapper MAPPER = new ObjectMapper();
+
+    // [databind#1433]
+    public void testConvertValueNullPrimitive() throws Exception
+    {
+        assertEquals(Byte.valueOf((byte) 0), MAPPER.convertValue(null, Byte.TYPE));
+        assertEquals(Short.valueOf((short) 0), MAPPER.convertValue(null, Short.TYPE));
+        assertEquals(Integer.valueOf(0), MAPPER.convertValue(null, Integer.TYPE));
+        assertEquals(Long.valueOf(0L), MAPPER.convertValue(null, Long.TYPE));
+        assertEquals(Float.valueOf(0f), MAPPER.convertValue(null, Float.TYPE));
+        assertEquals(Double.valueOf(0d), MAPPER.convertValue(null, Double.TYPE));
+        assertEquals(Character.valueOf('\0'), MAPPER.convertValue(null, Character.TYPE));
+        assertEquals(Boolean.FALSE, MAPPER.convertValue(null, Boolean.TYPE));
+    }
+
+    // [databind#1433]
+    public void testConvertValueNullBoxed() throws Exception
+    {
+        assertNull(MAPPER.convertValue(null, Byte.class));
+        assertNull(MAPPER.convertValue(null, Short.class));
+        assertNull(MAPPER.convertValue(null, Integer.class));
+        assertNull(MAPPER.convertValue(null, Long.class));
+        assertNull(MAPPER.convertValue(null, Float.class));
+        assertNull(MAPPER.convertValue(null, Double.class));
+        assertNull(MAPPER.convertValue(null, Character.class));
+        assertNull(MAPPER.convertValue(null, Boolean.class));
+    }
+}

src/test/java/com/fasterxml/jackson/databind/convert/TestBeanConversions.java

@@ -12,11 +12,13 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.util.StdConverter;
 
+/**
+ * Tests for various conversions, especially ones using
+ * {@link ObjectMapper#convertValue(Object, Class)}.
+ */
 public class TestBeanConversions
     extends com.fasterxml.jackson.databind.BaseMapTest
 {
-    final ObjectMapper MAPPER = new ObjectMapper();
-
     static class PointZ {
         public int x, y;
 
@@ -66,7 +68,7 @@ public Leaf() { }
         public Leaf(int v) { value = v; }
     }
 
-    // [Issue#288]
+    // [databind#288]
 
     @JsonSerialize(converter = ConvertingBeanConverter.class)
     static class ConvertingBean { 
@@ -116,6 +118,8 @@ public NullBean deserialize(final JsonParser parser, final DeserializationContex
     /**********************************************************
      */
 
+    private final ObjectMapper MAPPER = new ObjectMapper();
+
     public void testBeanConvert()
     {
         // should have no problems convert between compatible beans...
@@ -279,6 +283,7 @@ public void testConversionIssue1433() throws Exception
         assertNull(MAPPER.convertValue(null, Object.class));
         assertNull(MAPPER.convertValue(null, PointZ.class));
 
-        assertSame(NullBean.NULL_INSTANCE, MAPPER.convertValue(null, NullBean.class));
+        assertSame(NullBean.NULL_INSTANCE,
+                MAPPER.convertValue(null, NullBean.class));
     }
 }