Merge branch '2.5'

FasterXML · Feb 11, 2015 · d22b735 · d22b735
2 parents 605dbd6 + bff35ba
commit d22b735
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/src/test/java/com/fasterxml/jackson/databind/module/TestAbstractTypes.java b/src/test/java/com/fasterxml/jackson/databind/module/TestAbstractTypes.java
@@ -54,7 +54,7 @@ public void testCollectionDefaulting() throws Exception
         assertEquals(LinkedList.class, result.getClass());
     }
 
-    public void testMapDefaulting() throws Exception
+    public void testMapDefaultingBasic() throws Exception
     {
         ObjectMapper mapper = new ObjectMapper();
         SimpleModule mod = new SimpleModule("test", Version.unknownVersion());
@@ -64,7 +64,24 @@ public void testMapDefaulting() throws Exception
         Map<?,?> result = mapper.readValue("{}", Map.class);
         assertEquals(TreeMap.class, result.getClass());
     }
-
+
+    /* 11-Feb-2015, tatu: too tricky to fix in 2.5.x; move to 2.6
+    // [databind#700]
+    public void testMapDefaultingRecursive() throws Exception
+    {
+        ObjectMapper mapper = new ObjectMapper();
+        SimpleModule mod = new SimpleModule("test", Version.unknownVersion());
+        // default is HashMap, so:
+        mod.addAbstractTypeMapping(Map.class, TreeMap.class);
+        mapper.registerModule(mod);
+        Object result = mapper.readValue("[ {} ]", Object.class);
+        assertEquals(ArrayList.class, result.getClass());
+        Object v = ((List<?>) result).get(0);
+        assertNotNull(v);
+        assertEquals(TreeMap.class, v.getClass());
+    }
+    */
+
     public void testInterfaceDefaulting() throws Exception
     {
         ObjectMapper mapper = new ObjectMapper();