Merge branch '2.14' into 2.15

cowtowncoder · cowtowncoder · commit 587382c3dbfb · 2022-11-25T20:20:46.000-08:00
diff --git a/src/test/java/com/fasterxml/jackson/databind/MapperFootprintTest.java b/src/test/java/com/fasterxml/jackson/databind/MapperFootprintTest.java
@@ -26,8 +26,9 @@ public void testMapperFootprint() throws InterruptedException {
         GraphLayout mapperLayout = mapperLayoutA.totalSize() > mapperLayoutB.totalSize() ?
                 mapperLayoutB : mapperLayoutA;
 
+        final int maxByteSize = 20_000;
         Assert.assertTrue(
-                "ObjectMapper memory footprint exceeded limit. Footprint details: " + mapperLayout.toFootprint(),
-                mapperLayout.totalSize() < 10000);
+                "ObjectMapper memory footprint exceeded limit ("+maxByteSize+"). Footprint details: " + mapperLayout.toFootprint(),
+                mapperLayout.totalSize() < maxByteSize);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,9 @@ public void testMapperFootprint() throws InterruptedException {`
`26`	`26`	`GraphLayout mapperLayout = mapperLayoutA.totalSize() > mapperLayoutB.totalSize() ?`
`27`	`27`	`mapperLayoutB : mapperLayoutA;`
`28`	`28`
	`29`	`+ final int maxByteSize = 20_000;`
`29`	`30`	`Assert.assertTrue(`
`30`		`- "ObjectMapper memory footprint exceeded limit. Footprint details: " + mapperLayout.toFootprint(),`
`31`		`- mapperLayout.totalSize() < 10000);`
	`31`	`+ "ObjectMapper memory footprint exceeded limit ("+maxByteSize+"). Footprint details: " + mapperLayout.toFootprint(),`
	`32`	`+ mapperLayout.totalSize() < maxByteSize);`
`32`	`33`	`}`
`33`	`34`	`}`