minor test refactorings for type-related tests

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/databind/type/JavaType76Test.java

@@ -2,11 +2,9 @@
 
 import com.fasterxml.jackson.databind.*;
 
-/**
- * Failing test related to [databind#609]
- */
-public class TestLocalType609 extends BaseMapTest
+public class LocalTypeTest extends BaseMapTest
 {
+    // [databind#609]
     static class EntityContainer {
         RuleForm entity;
 
@@ -22,6 +20,7 @@ public RuleForm() { }
         public RuleForm(int v) { value = v; }
     }
 
+    // [databind#609]
     public void testLocalPartialType609() throws Exception {
         ObjectMapper mapper = new ObjectMapper();
 

src/test/java/com/fasterxml/jackson/databind/type/TestLocalType609.java renamed to src/test/java/com/fasterxml/jackson/databind/type/LocalTypeTest.java

@@ -4,9 +4,13 @@
 
 import com.fasterxml.jackson.databind.*;
 
-// for [databind#938]
-public class RecursiveType938Test extends BaseMapTest
+public class RecursiveTypeTest extends BaseMapTest
 {
+    // for [databind#1301]
+    @SuppressWarnings("serial")
+    static class HashTree<K, V> extends HashMap<K, HashTree<K, V>> { }
+
+ // for [databind#938]
     public static interface Ability<T> { }
 
     public static final class ImmutablePair<L, R> implements Map.Entry<L, R>, Ability<ImmutablePair<L, R>> {
@@ -38,8 +42,27 @@ static <L, R> ImmutablePair<L, R> of(final L left, final R right) {
         }
     }
 
+    // for [databind#1301]
+    public void testRecursiveType()
+    {
+        TypeFactory tf = TypeFactory.defaultInstance();
+        JavaType type = tf.constructType(HashTree.class);
+        assertNotNull(type);
+    }
+    
+    // for [databind#1301]
+    @SuppressWarnings("serial")
+    static class DataDefinition extends HashMap<String, DataDefinition> {
+        public DataDefinition definition;
+        public DataDefinition elements;
+        public String regex;
+        public boolean required;
+        public String type;
+    }
+    
     private final ObjectMapper MAPPER = new ObjectMapper();
 
+    // [databind#938]
     public void testRecursivePair() throws Exception
     {
         JavaType t = MAPPER.constructType(ImmutablePair.class);
@@ -55,4 +78,19 @@ public void testRecursivePair() throws Exception
 
         // can not deserialize with current definition, however
     }
+
+    // for [databind#1301]
+    public void testJavaTypeToString() throws Exception
+    {
+        TypeFactory tf = objectMapper().getTypeFactory();
+        String desc = tf.constructType(DataDefinition.class).toString();
+        assertNotNull(desc);
+        // could try comparing exact message, but since it's informational try looser:
+        if (!desc.contains("map type")) {
+            fail("Description should contain 'map type', did not: "+desc);
+        }
+        if (!desc.contains("recursive type")) {
+            fail("Description should contain 'recursive type', did not: "+desc);
+        }
+    }
 }