Merge branch '2.13'

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/failing/ParserErrorHandlingTest.java renamed to src/test/java/com/fasterxml/jackson/failing/ParserErrorHandling105Test.java

@@ -4,22 +4,19 @@
 import com.fasterxml.jackson.core.exc.StreamReadException;
 
 // Failing tests for non-root-token problem
-public class ParserErrorHandlingTest
+public class ParserErrorHandling105Test
     extends com.fasterxml.jackson.core.BaseTest
 {
     // Tests for [core#105] ("eager number parsing misses errors")
-    public void testMangledIntsBytes() {
-        _testMangledNonRootInts(MODE_INPUT_STREAM);
-        _testMangledNonRootInts(MODE_INPUT_STREAM_THROTTLED);
-
+    public void testMangledIntsBytes() throws Exception {
         // 02-Jun-2017, tatu: Fails to fail; should check whether this is expected
         //   (since DataInput can't do look-ahead)
-//        _testMangledNonRootInts(MODE_DATA_INPUT);
+        _testMangledNonRootInts(MODE_DATA_INPUT);
     }
 
-    public void testMangledFloatsBytes() {
-        _testMangledNonRootFloats(MODE_INPUT_STREAM);
-        _testMangledNonRootFloats(MODE_INPUT_STREAM_THROTTLED);
+    public void testMangledFloatsBytes() throws Exception {
+//        _testMangledNonRootFloats(MODE_INPUT_STREAM);
+//        _testMangledNonRootFloats(MODE_INPUT_STREAM_THROTTLED);
 
         // 02-Jun-2017, tatu: Fails as expected, unlike int one. Bit puzzling...
         _testMangledNonRootFloats(MODE_DATA_INPUT);

src/test/java/com/fasterxml/jackson/failing/ParserErrorHandling679Test.java

@@ -0,0 +1,75 @@
+package com.fasterxml.jackson.failing;
+
+import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.core.exc.StreamReadException;
+
+public class ParserErrorHandling679Test
+    extends com.fasterxml.jackson.core.BaseTest
+{
+    // [core#679]
+    public void testNonRootMangledFloats679Bytes() throws Exception {
+        _testNonRootMangledFloats679(MODE_INPUT_STREAM);
+        _testNonRootMangledFloats679(MODE_INPUT_STREAM_THROTTLED);
+        _testNonRootMangledFloats679(MODE_DATA_INPUT);
+    }
+
+    // [core#679]
+    public void testNonRootMangledFloats679Chars() throws Exception {
+        _testNonRootMangledFloats679(MODE_READER);
+    }
+
+    // [core#679]
+    public void testNonRootMangledInts679Bytes() throws Exception {
+        _testNonRootMangledInts(MODE_INPUT_STREAM);
+        _testNonRootMangledInts(MODE_INPUT_STREAM_THROTTLED);
+        _testNonRootMangledInts(MODE_DATA_INPUT);
+        _testNonRootMangledInts(MODE_READER);
+    }
+
+    /*
+    /**********************************************************************
+    /* Helper methods
+    /**********************************************************************
+     */
+
+    private void _testNonRootMangledFloats679(int mode) throws Exception {
+        _testNonRootMangledFloats679(mode, "1.5x");
+        _testNonRootMangledFloats679(mode, "1.5.00");
+    }
+
+    private void _testNonRootMangledFloats679(int mode, String value) throws Exception
+    {
+        // Also test with floats
+        JsonParser p = createParser(mode, "[ "+value+" ]");
+        assertEquals(JsonToken.START_ARRAY, p.nextToken());
+        try {
+            JsonToken t = p.nextToken();
+            Double v = p.getDoubleValue();
+            fail("Should have gotten an exception for '"+value+"'; instead got ("+t+") number: "+v);
+        } catch (StreamReadException e) {
+            verifyException(e, "expected ");
+        }
+        p.close();
+    }
+
+    private void _testNonRootMangledInts(int mode) throws Exception {
+        _testNonRootMangledInts(mode, "100k");
+        _testNonRootMangledInts(mode, "100/");
+    }
+
+    private void _testNonRootMangledInts(int mode, String value) throws Exception
+    {
+        // Also test with floats
+        JsonParser p = createParser(mode, "[ "+value+" ]");
+        assertEquals(JsonToken.START_ARRAY, p.nextToken());
+        try {
+            JsonToken t = p.nextToken();
+            int v = p.getIntValue();
+            fail("Should have gotten an exception for '"+value+"'; instead got ("+t+") number: "+v);
+        } catch (StreamReadException e) {
+            verifyException(e, "expected ");
+        }
+        p.close();
+    }
+}