Merge branch '2.18'

Author: cowtowncoder

src/test/java/tools/jackson/databind/jsontype/TestPolymorphicDeduction.java

@@ -71,8 +71,8 @@ static enum Enum3711 { A, B }
   /**********************************************************
    */
 
-  private static final String deadCatJson = a2q("{'name':'Felix','causeOfDeath':'entropy'}");
-  private static final String liveCatJson = a2q("{'name':'Felix','angry':true}");
+  private static final String deadCatJson = a2q("{'causeOfDeath':'entropy','name':'Felix'}");
+  private static final String liveCatJson = a2q("{'angry':true,'name':'Felix'}");
   private static final String luckyCatJson = a2q("{'name':'Felix','angry':true,'lives':8}");
   private static final String ambiguousCatJson = a2q("{'name':'Felix','age':2}");
   private static final String fleabagJson = a2q("{}");
@@ -90,7 +90,9 @@ static enum Enum3711 { A, B }
   /**********************************************************
    */
 
-  private final ObjectMapper MAPPER = newJsonMapper();
+  private final ObjectMapper MAPPER = jsonMapperBuilder()
+          .enable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
+          .build();
 
   @Test
   public void testSimpleInference() throws Exception {

src/test/java/tools/jackson/databind/jsontype/TestTypeNames.java

@@ -44,7 +44,9 @@ static class B1616 extends Base1616 { }
     /**********************************************************
      */
 
-    private final ObjectMapper MAPPER = newJsonMapper();
+    private final ObjectMapper MAPPER = jsonMapperBuilder()
+            .enable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY)
+            .build();
 
     @Test
     public void testBaseTypeId1616() throws Exception
@@ -72,7 +74,7 @@ public void testSerialization() throws Exception
         // static type on serialization. If we had root static types,
         // could use those; but at the moment root type is dynamic
 
-        assertEquals("[{\"doggy\":{\"name\":\"Spot\",\"ageInYears\":3}}]",
+        assertEquals("[{\"doggy\":{\"ageInYears\":3,\"name\":\"Spot\"}}]",
                 MAPPER.writeValueAsString(new Animal[] { new Dog("Spot", 3) }));
         assertEquals("[{\"MaineCoon\":{\"name\":\"Belzebub\",\"purrs\":true}}]",
                 MAPPER.writeValueAsString(new Animal[] { new MaineCoon("Belzebub", true)}));