Move failing #2016 under failing, needs more tests, work

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/databind/deser/creators/TestCreatorsDelegating.java

@@ -9,7 +9,6 @@
 import com.fasterxml.jackson.core.JsonToken;
 
 import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.util.TokenBuffer;
 
 public class TestCreatorsDelegating extends BaseMapTest
@@ -83,20 +82,6 @@ public MapBean(Map<String, Long> map) {
         }
     }
 
-    // [databind#2016]
-    static class Wrapper2016 {
-        private final List<String> value;
-
-        @JsonCreator //(mode = JsonCreator.Mode.DELEGATING)
-        public Wrapper2016(@JsonDeserialize(as = LinkedList.class) List<String> value) {
-            this.value = value;
-        }
-
-        public List<String> getValue() {
-            return value;
-        }
-    }
-
     /*
     /**********************************************************
     /* Test methods
@@ -194,13 +179,4 @@ public void testIssue465() throws Exception
         bean = MAPPER.readValue(EMPTY_JSON, MapBean.class);
         assertEquals(0, bean.map.size());
     }
-
-    // [databind#2016]
-    public void testCreatorWithDeserializeAs2016() throws Exception
-    {
-        String json = "[\"Hello, World!\"]";
-        Wrapper2016 actual = MAPPER.readValue(json, Wrapper2016.class);
-        assertEquals(Collections.singletonList("Hello, World!"), actual.getValue());
-        assertEquals(LinkedList.class, actual.getValue().getClass());
-    }
 }

src/test/java/com/fasterxml/jackson/failing/DelegatingCreatorAnnotations2016Test.java

@@ -0,0 +1,55 @@
+package com.fasterxml.jackson.failing;
+
+import java.util.*;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.databind.BaseMapTest;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+
+// Tests for problems uncovered with [databind#2016]; related to
+// `@JsonDeserialize` modifications to type, deserializer(s)
+public class DelegatingCreatorAnnotations2016Test extends BaseMapTest
+{
+    // [databind#2016]
+    static class Wrapper2016As {
+        Object value;
+
+        @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
+        public Wrapper2016As(@JsonDeserialize(as = java.util.Date.class) Object v) {
+            value = v;
+        }
+    }
+
+    static class Wrapper2016ContentAs {
+        List<Object> value;
+
+        @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
+        public Wrapper2016ContentAs(@JsonDeserialize(contentAs = java.util.Date.class) List<Object> v) {
+            value = v;
+        }
+    }
+
+    /*
+    /**********************************************************************
+    /* Test methods
+    /**********************************************************************
+     */
+
+    private final ObjectMapper MAPPER = newObjectMapper();
+
+    // [databind#2016]
+    public void testDelegatingWithAs() throws Exception
+    {
+        Wrapper2016As actual = MAPPER.readValue("123", Wrapper2016As.class);
+        assertEquals(Date.class, actual.value.getClass());
+    }
+
+    public void testDelegatingWithContentAs() throws Exception
+    {
+        Wrapper2016ContentAs actual = MAPPER.readValue("[123]", Wrapper2016ContentAs.class);
+        List<Object> l = actual.value;
+        assertEquals(1, l.size());
+        assertEquals(Date.class, l.get(0).getClass());
+    }
+}