Merge branch '3.0' into 3.x

Author: cowtowncoder

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

@@ -18,12 +18,11 @@ class NumberOverflowTest
     extends JacksonCoreTestBase
 {
     private final JsonFactory FACTORY = JsonFactory.builder()
-            .streamReadConstraints(StreamReadConstraints.builder().maxNumberLength(1000000).build())
+            .streamReadConstraints(StreamReadConstraints.builder().maxNumberLength(1_000_000).build())
             .build();
 
     // NOTE: this should be long enough to trigger perf problems
-    // 19-
-    private final static int BIG_NUM_LEN = 199999;
+    private final static int BIG_NUM_LEN = 199_999;
     private final static String BIG_POS_INTEGER;
     static {
         StringBuilder sb = new StringBuilder(BIG_NUM_LEN);
@@ -73,13 +72,12 @@ void simpleLongOverflow() throws Exception
     }
 
     // Note: only 4 cardinal types; `short`, `byte` and `char` use same code paths
-    // Note: due to [jackson-core#493], we'll skip DataInput-backed parser
 
     // [jackson-core#488]
     @Test
     void maliciousLongOverflow() throws Exception
     {
-        for (int mode : ALL_STREAMING_MODES) {
+        for (int mode : ALL_MODES) {
             for (String doc : new String[] { BIG_POS_DOC, BIG_NEG_DOC }) {
                 JsonParser p = createParser(FACTORY, mode, doc);
                 assertToken(JsonToken.START_ARRAY, p.nextToken());
@@ -102,7 +100,7 @@ void maliciousLongOverflow() throws Exception
     @Test
     void maliciousIntOverflow() throws Exception
     {
-        for (int mode : ALL_STREAMING_MODES) {
+        for (int mode : ALL_MODES) {
             for (String doc : new String[] { BIG_POS_DOC, BIG_NEG_DOC }) {
                 JsonParser p = createParser(FACTORY, mode, doc);
                 assertToken(JsonToken.START_ARRAY, p.nextToken());
@@ -125,7 +123,7 @@ void maliciousIntOverflow() throws Exception
     @Test
     void maliciousBigIntToDouble() throws Exception
     {
-        for (int mode : ALL_STREAMING_MODES) {
+        for (int mode : ALL_MODES) {
             final String doc = BIG_POS_DOC;
             JsonParser p = createParser(FACTORY, mode, doc);
             assertToken(JsonToken.START_ARRAY, p.nextToken());
@@ -141,7 +139,7 @@ void maliciousBigIntToDouble() throws Exception
     @Test
     void maliciousBigIntToFloat() throws Exception
     {
-        for (int mode : ALL_STREAMING_MODES) {
+        for (int mode : ALL_MODES) {
             final String doc = BIG_POS_DOC;
             JsonParser p = createParser(FACTORY, mode, doc);
             assertToken(JsonToken.START_ARRAY, p.nextToken());