Merge branch '3.0' into 3.x

Author: cowtowncoder

…x/async/AsyncParserNonRootTokenTest.java …fix/async/AsyncTokenBranchErrorTest.javasrc/test/java/tools/jackson/core/unittest/tofix/async/AsyncParserNonRootTokenTest.java renamed to src/test/java/tools/jackson/core/unittest/tofix/async/AsyncTokenBranchErrorTest.java src/test/java/tools/jackson/core/unittest/tofix/async/AsyncParserNonRootTokenTest.java renamed to src/test/java/tools/jackson/core/unittest/tofix/async/AsyncTokenBranchErrorTest.java

@@ -11,7 +11,9 @@
 
 import static org.junit.jupiter.api.Assertions.fail;
 
-class AsyncParserNonRootTokenTest extends AsyncTestBase
+// Tests for handling token decoding fails for non-Root values
+// (within Object / Array)
+class AsyncTokenBranchErrorTest extends AsyncTestBase
 {
     private final JsonFactory JSON_F = newStreamFactory();
 
@@ -52,6 +54,15 @@ private void _doTestInvalidKeyword(String value)
         } catch (StreamReadException jex) {
             verifyException(jex, EXP_MAIN, EXP_ALT);
         }
+
+        // Try as root-level value as well:
+        doc = value + " "; // may need space after for DataInput
+        try (AsyncReaderWrapper p = _createParser(doc)) {
+            p.nextToken();
+            fail("Expected an exception for malformed value keyword");
+        } catch (StreamReadException jex) {
+            verifyException(jex, EXP_MAIN, EXP_ALT);
+        }
     }
 
     @JacksonTestFailureExpected

src/test/java/tools/jackson/core/unittest/tofix/async/AsyncTokenRootErrorTest.java

@@ -0,0 +1,48 @@
+package tools.jackson.core.unittest.tofix.async;
+
+import org.junit.jupiter.api.Test;
+
+import tools.jackson.core.*;
+import tools.jackson.core.json.JsonFactory;
+import tools.jackson.core.exc.StreamReadException;
+import tools.jackson.core.unittest.async.AsyncTestBase;
+import tools.jackson.core.unittest.testutil.AsyncReaderWrapper;
+import tools.jackson.core.unittest.testutil.failure.JacksonTestFailureExpected;
+
+import static org.junit.jupiter.api.Assertions.fail;
+
+// Tests for handling token decoding fails for Root values
+class AsyncTokenRootErrorTest extends AsyncTestBase
+{
+    private final JsonFactory JSON_F = newStreamFactory();
+
+    @JacksonTestFailureExpected
+    @Test
+    void mangledRootInts() throws Exception
+    {
+        try (AsyncReaderWrapper p = _createParser("123true")) {
+            JsonToken t = p.nextToken();
+            fail("Should have gotten an exception; instead got token: "+t+"; number: "+p.getNumberValue());
+        } catch (StreamReadException e) {
+            verifyException(e, "expected space");
+        }
+    }
+
+    @JacksonTestFailureExpected
+    @Test
+    void mangledRootFloats() throws Exception
+    {
+        // Also test with floats
+        try (AsyncReaderWrapper p = _createParser("1.5false")) {
+            JsonToken t = p.nextToken();
+            fail("Should have gotten an exception; instead got token: "+t+"; number: "+p.getNumberValue());
+        } catch (StreamReadException e) {
+            verifyException(e, "expected space");
+        }
+    }
+
+    private AsyncReaderWrapper _createParser(String doc) throws Exception
+    {
+        return asyncForBytes(JSON_F, 1, _jsonDoc(doc), 1);
+    }
+}