Skip to content

Commit 8fcf9ef

Browse files
committed
Merge branch '2.15' into 2.16
2 parents e9db4b3 + e5bdcfb commit 8fcf9ef

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/test/java/com/fasterxml/jackson/databind/deser/dos/DeepJsonNodeDeser3397Test.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class DeepJsonNodeDeser3397Test extends BaseMapTest
1313
// ... currently gets a bit slow at 1M but passes.
1414
// But test with 100k as practical limit, to guard against regression
1515
// private final static int TOO_DEEP_NESTING = 1_000_000;
16-
private final static int TOO_DEEP_NESTING = 10_000;
16+
private final static int TOO_DEEP_NESTING = StreamReadConstraints.DEFAULT_MAX_DEPTH * 10;
1717

1818
private final JsonFactory jsonFactory = JsonFactory.builder()
1919
.streamReadConstraints(StreamReadConstraints.builder().maxNestingDepth(Integer.MAX_VALUE).build())

src/test/java/com/fasterxml/jackson/databind/deser/dos/DeepNestingUntypedDeserTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class DeepNestingUntypedDeserTest extends BaseMapTest
1818
// 31-May-2022, tatu: But no more! Can handle much much larger
1919
// nesting levels, bounded by memory usage not stack. Tested with
2020
// 1 million (!) nesting levels, but to keep tests fast use 100k
21-
private final static int TOO_DEEP_NESTING = 100_000;
21+
private final static int TOO_DEEP_NESTING = StreamReadConstraints.DEFAULT_MAX_DEPTH * 100;
2222

2323
private final JsonFactory jsonFactory = JsonFactory.builder()
2424
.streamReadConstraints(StreamReadConstraints.builder().maxNestingDepth(Integer.MAX_VALUE).build())

src/test/java/com/fasterxml/jackson/databind/deser/dos/StreamReadStringConstraintsTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ void setString(String string) {
3232
/**********************************************************************
3333
*/
3434

35-
private final static int TOO_LONG_STRING_VALUE = 20_100_000;
35+
private final static int TOO_LONG_STRING_VALUE = StreamReadConstraints.DEFAULT_MAX_STRING_LEN + 100;
3636

3737
private final ObjectMapper MAPPER = newJsonMapper();
3838

0 commit comments

Comments
 (0)