...

Author: cowtowncoder

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

@@ -4,7 +4,6 @@
 import java.lang.reflect.Array;
 import java.math.BigDecimal;
 import java.math.BigInteger;
-import java.util.List;
 
 import org.junit.Assert;
 
@@ -14,7 +13,6 @@
 import com.fasterxml.jackson.core.*;
 
 import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.JsonMappingException.Reference;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 import com.fasterxml.jackson.databind.util.ClassUtil;
 
@@ -616,9 +614,8 @@ public void testNullForPrimitivesViaCreator() throws IOException
     }
 
     private void verifyPath(MismatchedInputException e, String propName) {
-        final List<Reference> path = e.getPath();
-        assertEquals(1, path.size());
-        assertEquals(propName, path.get(0).getFieldName());
+        assertEquals(1, e.getPath().size());
+        assertEquals(propName, e.getPath().get(0).getFieldName());
     }
 
     public void testNullForPrimitiveArrays() throws IOException

src/test/java/com/fasterxml/jackson/databind/jsontype/TestPolymorphicWithDefaultImpl.java

@@ -264,7 +264,7 @@ public void testWithoutEmptyStringAsNullObject1533() throws Exception
                 .without(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT);
         try {
             r.readValue("{ \"value\": \"\" }");
-            fail("Expected " + JsonMappingException.class);
+            fail("Expected InvalidTypeIdException");
         } catch (InvalidTypeIdException e) {
             verifyException(e, "missing type id property 'type'");
         }

src/test/java/com/fasterxml/jackson/databind/objectid/JSOGDeserialize622Test.java

@@ -1,18 +1,12 @@
 package com.fasterxml.jackson.databind.objectid;
 
-import com.fasterxml.jackson.annotation.JsonIdentityInfo;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.*;
 import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
 import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
-import com.fasterxml.jackson.annotation.ObjectIdGenerator;
+
 import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.BaseMapTest;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonMappingException;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
+
+import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
 import java.io.IOException;
@@ -104,7 +98,7 @@ public JSOGRef deserialize(JsonParser p, DeserializationContext ctx) throws IOEx
           }
           JsonNode n = node.get(REF_KEY);
           if (n == null) {
-              throw new JsonMappingException(p, "Could not find key '"+REF_KEY
+              ctx.reportInputMismatch(JSOGRef.class, "Could not find key '"+REF_KEY
                       +"' from ("+node.getClass().getName()+"): "+node);
           }
           return new JSOGRef(n.asInt());