Add improved tests wrt #2635 fix

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/databind/struct/ScalarCoercionTest.java

@@ -11,9 +11,12 @@
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 
-// for [databind#1106]
 public class ScalarCoercionTest extends BaseMapTest
 {
+    static class BooleanPOJO {
+        public boolean value;
+    }
+
     private final ObjectMapper COERCING_MAPPER = jsonMapperBuilder()
             .enable(MapperFeature.ALLOW_COERCION_OF_SCALARS)
             .build();
@@ -161,11 +164,25 @@ public void testStringCoercionFail() throws Exception
         _verifyRootStringCoerceFail("123.0", BigDecimal.class);
     }
 
+    public void testToBooleanCoercionFailBytes() throws Exception
+    {
+        final String beanDoc = aposToQuotes("{'value':1}");
+        _verifyBooleanCoerceFail("1", true, JsonToken.VALUE_NUMBER_INT, "1", Boolean.TYPE);
+        _verifyBooleanCoerceFail("1", true, JsonToken.VALUE_NUMBER_INT, "1", Boolean.class);
+        _verifyBooleanCoerceFail(beanDoc, true, JsonToken.VALUE_NUMBER_INT, "1", BooleanPOJO.class);
+    }
+
+    public void testToBooleanCoercionFailChars() throws Exception
+    {
+        final String beanDoc = aposToQuotes("{'value':1}");
+        _verifyBooleanCoerceFail("1", false, JsonToken.VALUE_NUMBER_INT, "1", Boolean.TYPE);
+        _verifyBooleanCoerceFail("1", false, JsonToken.VALUE_NUMBER_INT, "1", Boolean.class);
+        _verifyBooleanCoerceFail(beanDoc, false, JsonToken.VALUE_NUMBER_INT, "1", BooleanPOJO.class);
+    }
+
     public void testMiscCoercionFail() throws Exception
     {
         // And then we have coercions from more esoteric types too
-        _verifyCoerceFail("1", Boolean.TYPE);
-        _verifyCoerceFail("1", Boolean.class);
 
         _verifyCoerceFail("65", Character.class);
         _verifyCoerceFail("65", Character.TYPE);
@@ -230,4 +247,46 @@ private void _verifyStringCoerceFail(JsonParser p,
             assertEquals(unquotedValue, p.getText());
         }
     }
+
+    private void _verifyBooleanCoerceFail(String doc, boolean useBytes,
+            JsonToken tokenType, String tokenValue, Class<?> targetType) throws IOException
+    {
+        // Test failure for root value: for both byte- and char-backed sources.
+
+        // [databind#2635]: important, need to use `readValue()` that takes content and NOT
+        // JsonParser, as this forces closing of underlying parser and exposes more issues.
+
+        final ObjectReader r = NOT_COERCING_MAPPER.readerFor(targetType);
+        try {
+            if (useBytes) {
+                r.readValue(utf8Bytes(doc));
+            } else {
+                r.readValue(doc);
+            }
+            fail("Should not have allowed coercion");
+        } catch (MismatchedInputException e) {
+            _verifyBooleanCoerceFailReason(e, tokenType, tokenValue);
+        }
+    }
+
+    @SuppressWarnings("resource")
+    private void _verifyBooleanCoerceFailReason(MismatchedInputException e,
+            JsonToken tokenType, String tokenValue) throws IOException
+    {
+        verifyException(e, "Cannot coerce ");
+        verifyException(e, " for type `");
+        verifyException(e, "enable `MapperFeature.ALLOW_COERCION_OF_SCALARS` to allow");
+
+        JsonParser p = (JsonParser) e.getProcessor();
+
+        assertToken(tokenType, p.currentToken());
+
+        final String text = p.getText();
+
+        if (!tokenValue.equals(text)) {
+            String textDesc = (text == null) ? "NULL" : quote(text);
+            fail("Token text ("+textDesc+") via parser of type "+p.getClass().getName()
+                    +" not as expected ("+quote(tokenValue)+")");
+        }
+    }
 }