minor test robustification

Author: cowtowncoder

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

@@ -81,7 +81,8 @@ protected ObjectWrapper(final Object object) {
             this.object = object;
         }
         public Object getObject() { return object; }
-        @JsonCreator
+
+        @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
         static ObjectWrapper jsonValue(final Object object) {
             return new ObjectWrapper(object);
         }

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

@@ -32,9 +32,8 @@ public AbstractCustomType convert(String arg) {
     public static class AbstractCustomTypeUser {
         @JsonProperty
         @JsonDeserialize(converter = AbstractCustomTypeDeserializationConverter.class)
-        private final AbstractCustomType customField;
+        protected AbstractCustomType customField;
 
-        @JsonCreator
         AbstractCustomTypeUser(@JsonProperty("customField") AbstractCustomType cf) {
             this.customField = cf;
         }
@@ -74,13 +73,13 @@ public static class NonAbstractCustomTypeUser {
     private static final ObjectMapper JSON_MAPPER = newObjectMapper();
 
     public void testAbstractTypeDeserialization() throws Exception {
-        String test="{\"customField\": \"customString\"}";
+        String test = aposToQuotes("{'customField': 'customString'}");
         AbstractCustomTypeUser cu = JSON_MAPPER.readValue(test, AbstractCustomTypeUser.class);
         assertNotNull(cu);
     }
 
     public void testNonAbstractDeserialization() throws Exception {
-        String test="{\"customField\": \"customString\"}";
+        String test = aposToQuotes("{'customField': 'customString'}");
         NonAbstractCustomTypeUser cu = JSON_MAPPER.readValue(test, NonAbstractCustomTypeUser.class);
         assertNotNull(cu);
     }

src/test/java/com/fasterxml/jackson/databind/deser/jdk/MapDeserializationTest.java

@@ -77,7 +77,9 @@ public static enum ConcreteType implements ITestType {
     }
 
     static class ClassStringMap extends HashMap<Class<?>,String> { }
-    
+
+    static class ObjectWrapperMap extends HashMap<String, ObjectWrapper> { }
+
     /*
     /**********************************************************
     /* Test methods, untyped (Object valued) maps
@@ -151,14 +153,12 @@ public void testUntypedMap3() throws Exception
             "{ \"double\":42.0, \"string\":\"string\","
             +"\"boolean\":true, \"list\":[\"list0\"],"
             +"\"null\":null }";
-    
-    static class ObjectWrapperMap extends HashMap<String, ObjectWrapper> { }
-    
+
     public void testSpecialMap() throws IOException
     {
-       final ObjectWrapperMap map = MAPPER.readValue(UNTYPED_MAP_JSON, ObjectWrapperMap.class);
-       assertNotNull(map);
-       _doTestUntyped(map);
+        final ObjectWrapperMap map = MAPPER.readValue(UNTYPED_MAP_JSON, ObjectWrapperMap.class);
+        assertNotNull(map);
+        _doTestUntyped(map);
     }
 
     public void testGenericMap() throws IOException

src/test/java/com/fasterxml/jackson/databind/introspect/TestAnnotationBundles.java

@@ -79,7 +79,7 @@ static class RecursiveHolder2 {
     static class RecursiveHolder3 {
         public int x;
 
-        @JsonCreator
+        @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
         @HolderA
         public RecursiveHolder3(int x) { this.x = x; }
     }

src/test/java/com/fasterxml/jackson/databind/jsontype/ext/ExternalTypeId198Test.java

@@ -26,27 +26,32 @@ static class Character {
     public static abstract class Attack {
         public String side;
 
-        @JsonCreator
-        public Attack(String side) {
+        protected Attack(String side) {
             this.side = side;
         }
     }
 
     public static class Kick extends Attack {
-        @JsonCreator
+        @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
         public Kick(String side) {
             super(side);
         }
     }
 
     public static class Punch extends Attack {
-        @JsonCreator
+        @JsonCreator(mode = JsonCreator.Mode.DELEGATING)
         public Punch(String side) {
             super(side);
         }
     }
 
-    final ObjectMapper MAPPER = new ObjectMapper();
+    /*
+    /**********************************************************
+    /* Test methods
+    /**********************************************************
+     */
+
+    final ObjectMapper MAPPER = newObjectMapper();
 
     public void testFails() throws Exception {
         String json = "{ \"name\": \"foo\", \"attack\":\"right\" } }";

src/test/java/com/fasterxml/jackson/databind/jsontype/ext/ExternalTypeIdTest.java

@@ -399,7 +399,7 @@ public void testIssue798() throws Exception
         Base base = new Derived1("derived1 prop val", "base prop val");
         BaseContainer baseContainer = new BaseContainer("bc prop val", base);
         String generatedJson = MAPPER.writeValueAsString(baseContainer);
-        BaseContainer baseContainer2 = MAPPER.readValue(generatedJson,BaseContainer.class);
+        BaseContainer baseContainer2 = MAPPER.readValue(generatedJson, BaseContainer.class);
         assertEquals("bc prop val", baseContainer.getBaseContainerProperty());
 
         Base b = baseContainer2.getBase();