Merge branch '2.18' into 2.19

cowtowncoder · cowtowncoder · commit a4ed58038598 · 2025-02-07T20:54:43.000-08:00
diff --git a/src/test/java/com/fasterxml/jackson/databind/format/MapEntryFormatTest.java b/src/test/java/com/fasterxml/jackson/databind/format/MapEntryFormatTest.java
@@ -188,6 +188,7 @@ public void testDefaultShapeOverride() throws Exception
                     cfg.setFormat(JsonFormat.Value.forShape(JsonFormat.Shape.OBJECT)))
                 .build();
         Map.Entry<String,String> input = new BeanWithMapEntry("foo", "bar").entry;
-        assertTrue(mapper.writeValueAsString(input).equals(a2q("{'key':'foo','value':'bar'}")) || mapper.writeValueAsString(input).equals(a2q("{'value':'bar','key':'foo'}")));
+        assertTrue(mapper.writeValueAsString(input).equals(a2q("{'key':'foo','value':'bar'}"))
+                || mapper.writeValueAsString(input).equals(a2q("{'value':'bar','key':'foo'}")));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -188,6 +188,7 @@ public void testDefaultShapeOverride() throws Exception`
`188`	`188`	`cfg.setFormat(JsonFormat.Value.forShape(JsonFormat.Shape.OBJECT)))`
`189`	`189`	`.build();`
`190`	`190`	`Map.Entry<String,String> input = new BeanWithMapEntry("foo", "bar").entry;`
`191`		`- assertTrue(mapper.writeValueAsString(input).equals(a2q("{'key':'foo','value':'bar'}")) \|\| mapper.writeValueAsString(input).equals(a2q("{'value':'bar','key':'foo'}")));`
	`191`	`+ assertTrue(mapper.writeValueAsString(input).equals(a2q("{'key':'foo','value':'bar'}"))`
	`192`	`+ \|\| mapper.writeValueAsString(input).equals(a2q("{'value':'bar','key':'foo'}")));`
`192`	`193`	`}`
`193`	`194`	`}`