minor test refactoring

src/main/java/com/fasterxml/jackson/databind/DeserializationConfig.java

@@ -256,7 +256,7 @@ protected DeserializationConfig(DeserializationConfig src, SimpleMixInResolver m
     /* Life-cycle, factory methods from MapperConfig
     /**********************************************************
      */
-    
+
     @Override
     public DeserializationConfig with(MapperFeature... features)
     {

src/test/java/com/fasterxml/jackson/databind/deser/PropertyMergeTest.java

@@ -0,0 +1,14 @@
+package com.fasterxml.jackson.databind.deser;
+
+import com.fasterxml.jackson.databind.*;
+
+/**
+ * Tests to make sure that the new "merging" property of
+ * <code>JsonSetter</code> annotation works as expected.
+ * 
+ * @since 2.9
+ */
+public class PropertyMergeTest extends BaseMapTest
+{
+    public void testFoo() { }
+}

src/test/java/com/fasterxml/jackson/databind/deser/TestBeanDeserializer.java

@@ -18,11 +18,9 @@
 @SuppressWarnings("serial")
 public class TestBeanDeserializer extends BaseMapTest
 {
-    /*
-    /**********************************************************
-    /* Helper types
-    /**********************************************************
-     */
+    static abstract class Abstract {
+        public int x;
+    }
 
     static class Bean {
         public String b = "b";
@@ -242,6 +240,20 @@ public String deserialize(JsonParser p, DeserializationContext ctxt)
 
     private final ObjectMapper MAPPER = new ObjectMapper();
 
+    /**
+     * Test to verify details of how trying to deserialize into
+     * abstract type should fail (if there is no way to determine
+     * actual type information for the concrete type to use)
+     */
+    public void testAbstractFailure() throws Exception
+    {
+        try {
+            MAPPER.readValue("{ \"x\" : 3 }", Abstract.class);
+            fail("Should fail on trying to deserialize abstract type");
+        } catch (JsonProcessingException e) {
+            verifyException(e, "can not construct");
+        }
+    }    
     public void testPropertyRemoval() throws Exception
     {
         ObjectMapper mapper = new ObjectMapper();

src/test/java/com/fasterxml/jackson/databind/deser/TestDateDeserialization.java → src/test/java/com/fasterxml/jackson/databind/deser/jdk/TestDateDeserialization.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.deser;
+package com.fasterxml.jackson.databind.deser.jdk;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;

src/test/java/com/fasterxml/jackson/databind/deser/TestPolymorphicDeserialization676.java → src/test/java/com/fasterxml/jackson/databind/jsontype/TestPolymorphicDeserialization676.java

@@ -1,4 +1,4 @@
-package com.fasterxml.jackson.databind.deser;
+package com.fasterxml.jackson.databind.jsontype;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;