Merge branch '2.11' into 2.12

2 files changed, 74 insertions, 1 deletions

diff --git a/src/test/java/com/fasterxml/jackson/databind/deser/jdk/JDKScalarsTest.java b/src/test/java/com/fasterxml/jackson/databind/deser/jdk/JDKScalarsTest.java
index b88acd3a0..dae57c6db 100644
--- a/src/test/java/com/fasterxml/jackson/databind/deser/jdk/JDKScalarsTest.java
+++ b/src/test/java/com/fasterxml/jackson/databind/deser/jdk/JDKScalarsTest.java
@@ -120,7 +120,7 @@ public class JDKScalarsTest
 
     private final ObjectMapper MAPPER = newJsonMapper();
 
-    final ObjectMapper MAPPER_NO_COERCION =jsonMapperBuilder()
+    private final ObjectMapper MAPPER_NO_COERCION = jsonMapperBuilder()
             .disable(MapperFeature.ALLOW_COERCION_OF_SCALARS)
             .build();
 
diff --git a/src/test/java/com/fasterxml/jackson/failing/UnwrapSingleArrayMiscTest.java b/src/test/java/com/fasterxml/jackson/failing/UnwrapSingleArrayMiscTest.java
new file mode 100644
index 000000000..f00485e49
--- /dev/null
+++ b/src/test/java/com/fasterxml/jackson/failing/UnwrapSingleArrayMiscTest.java
@@ -0,0 +1,73 @@
+package com.fasterxml.jackson.failing;
+
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.Map;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.exc.MismatchedInputException;
+
+public class UnwrapSingleArrayMiscTest extends BaseMapTest
+{
+    private final ObjectMapper UNWRAPPING_MAPPER = jsonMapperBuilder()
+            .enable(DeserializationFeature.UNWRAP_SINGLE_VALUE_ARRAYS)
+            .build();
+
+    /*
+    /**********************************************************
+    /* Tests methods, POJOs
+    /**********************************************************
+     */
+
+    public void testSimplePOJOUnwrapping() throws Exception
+    {
+        ObjectReader r = UNWRAPPING_MAPPER.readerFor(IntWrapper.class);
+        IntWrapper w = r.readValue(aposToQuotes("[{'i':42}]"));
+        assertEquals(42, w.i);
+
+        try {
+            r.readValue(aposToQuotes("[{'i':42},{'i':16}]"));
+            fail("Did not throw exception while reading a value from a multi value array");
+        } catch (MismatchedInputException e) {
+            verifyException(e, "more than one value");
+        }
+    }
+
+    /*
+    /**********************************************************
+    /* Tests methods, Maps
+    /**********************************************************
+     */
+
+    // [databind#2767]: should work for Maps, too
+    public void testSimpleMapUnwrapping() throws Exception
+    {
+        ObjectReader r = UNWRAPPING_MAPPER.readerFor(Map.class);
+        Map<String,Object> m = r.readValue(aposToQuotes("[{'stuff':42}]"));
+        assertEquals(Collections.<String,Object>singletonMap("stuff", Integer.valueOf(42)), m);
+
+        try {
+            r.readValue(aposToQuotes("[{'i':42},{'i':16}]"));
+            fail("Did not throw exception while reading a value from a multi value array");
+        } catch (MismatchedInputException e) {
+            verifyException(e, "more than one value");
+        }
+    }
+
+    public void testEnumMapUnwrapping() throws Exception
+    {
+        ObjectReader r = UNWRAPPING_MAPPER.readerFor(new TypeReference<EnumMap<ABC,Integer>>() { });
+        EnumMap<ABC,Integer> m = r.readValue(aposToQuotes("[{'A':42}]"));
+        EnumMap<ABC,Integer> exp = new EnumMap<>(ABC.class);
+        exp.put(ABC.A, Integer.valueOf(42));
+        assertEquals(exp, m);
+
+        try {
+            r.readValue(aposToQuotes("[{'A':42},{'B':13}]"));
+            fail("Did not throw exception while reading a value from a multi value array");
+        } catch (MismatchedInputException e) {
+            verifyException(e, "more than one value");
+        }
+    }
+}