Merge branch '2.x' into 3.0

Author: cowtowncoder

src/test/java/tools/jackson/core/unittest/read/ParserErrorHandlingTest.java

@@ -29,25 +29,23 @@ void invalidKeywordsChars() throws Exception {
 
     // Tests for [core#105] ("eager number parsing misses errors")
     @Test
-    void mangledIntsBytes() throws Exception {
-        _testMangledNumbersInt(MODE_INPUT_STREAM);
-        _testMangledNumbersInt(MODE_INPUT_STREAM_THROTTLED);
-        _testMangledNumbersInt(MODE_DATA_INPUT);
+    void mangledRootIntsBytes() throws Exception {
+        _testMangledRootNumbersInt(MODE_INPUT_STREAM);
+        _testMangledRootNumbersInt(MODE_INPUT_STREAM_THROTTLED);
+        _testMangledRootNumbersInt(MODE_DATA_INPUT);
     }
 
     @Test
-    void mangledFloatsBytes() throws Exception {
-        _testMangledNumbersFloat(MODE_INPUT_STREAM);
-        _testMangledNumbersFloat(MODE_INPUT_STREAM_THROTTLED);
-
-        // 02-Jun-2017, tatu: Fails as expected, unlike int one. Bit puzzling...
-        _testMangledNumbersFloat(MODE_DATA_INPUT);
+    void mangledRootFloatsBytes() throws Exception {
+        _testMangledRootNumbersFloat(MODE_INPUT_STREAM);
+        _testMangledRootNumbersFloat(MODE_INPUT_STREAM_THROTTLED);
+        _testMangledRootNumbersFloat(MODE_DATA_INPUT);
     }
 
     @Test
-    void mangledNumbersChars() throws Exception {
-        _testMangledNumbersInt(MODE_READER);
-        _testMangledNumbersFloat(MODE_READER);
+    void mangledRootNumbersChars() throws Exception {
+        _testMangledRootNumbersInt(MODE_READER);
+        _testMangledRootNumbersFloat(MODE_READER);
     }
 
     /*
@@ -104,7 +102,7 @@ private void doTestInvalidKeyword1(int mode, String value)
         }
     }
 
-    private void _testMangledNumbersInt(int mode)
+    private void _testMangledRootNumbersInt(int mode)
     {
         JsonParser p = createParser(JSON_F, mode, "123true");
         try {
@@ -116,7 +114,7 @@ private void _testMangledNumbersInt(int mode)
         p.close();
     }
 
-    private void _testMangledNumbersFloat(int mode)
+    private void _testMangledRootNumbersFloat(int mode)
     {
         // Also test with floats
         JsonParser p = createParser(JSON_F, mode, "1.5false");

src/test/java/tools/jackson/core/unittest/tofix/ParserErrorHandling105Test.java

@@ -28,7 +28,6 @@ void mangledFloatsBytes() 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);
     }