Test Failures on NonDex Issue-3693 (#3694)

Author: priyanka-28

src/test/java/com/fasterxml/jackson/databind/format/MapEntryFormatTest.java

@@ -177,7 +177,6 @@ public void testDefaultShapeOverride() throws Exception
                     cfg.setFormat(JsonFormat.Value.forShape(JsonFormat.Shape.OBJECT)))
                 .build();
         Map.Entry<String,String> input = new BeanWithMapEntry("foo", "bar").entry;
-        assertEquals(a2q("{'key':'foo','value':'bar'}"),
-                mapper.writeValueAsString(input));
+        assertTrue(mapper.writeValueAsString(input).equals(a2q("{'key':'foo','value':'bar'}")) || mapper.writeValueAsString(input).equals(a2q("{'value':'bar','key':'foo'}")));
     }
 }

src/test/java/com/fasterxml/jackson/databind/objectid/TestObjectIdWithEquals.java

@@ -9,6 +9,7 @@
 
 public class TestObjectIdWithEquals extends BaseMapTest
 {
+    @JsonPropertyOrder({"id","bars","otherBars"})
     @JsonIdentityInfo(generator=ObjectIdGenerators.PropertyGenerator.class, property="id", scope=Foo.class)
     static class Foo {
         public int id;
@@ -102,7 +103,6 @@ public void testSimpleEquals() throws Exception
 
         String json = mapper.writeValueAsString(foo);
         assertEquals("{\"id\":1,\"bars\":[{\"id\":1},{\"id\":2}],\"otherBars\":[1,2]}", json);
-
         Foo foo2 = mapper.readValue(json, Foo.class);       
         assertNotNull(foo2);
         assertEquals(foo.id, foo2.id);