Merge branch '2.14'

Author: cowtowncoder

jaxb/src/test/java/com/fasterxml/jackson/module/jaxb/id/TestXmlID2.java

@@ -116,10 +116,6 @@ private List<User> getUserList()
 
     public void testIdWithJacksonRules() throws Exception
     {
-        String expected = "[{\"id\":11,\"username\":\"11\",\"email\":\"[email protected]\","
-                +"\"department\":{\"id\":9,\"name\":\"department9\",\"employees\":["
-                +"11,{\"id\":22,\"username\":\"22\",\"email\":\"[email protected]\","
-                +"\"department\":9}]}},22,{\"id\":33,\"username\":\"33\",\"email\":\"[email protected]\",\"department\":null}]";
         ObjectMapper mapper = JsonMapper.builder()
                 // true -> ignore XmlIDREF annotation
                 .annotationIntrospector(new JaxbAnnotationIntrospector(true))
@@ -128,13 +124,24 @@ public void testIdWithJacksonRules() throws Exception
         // first, with default settings (first NOT as id)
         List<User> users = getUserList();
         String json = mapper.writeValueAsString(users);
-        assertEquals(expected, json);
 
         List<User> result = mapper.readValue(json, new TypeReference<List<User>>() { });
         assertEquals(3, result.size());
         assertEquals(Long.valueOf(11), result.get(0).id);
+        assertEquals("11", result.get(0).username);
+        assertEquals("[email protected]", result.get(0).email);
+        assertEquals(Long.valueOf(9), result.get(0).department.id);
+        assertEquals("department9", result.get(0).department.name);
+        assertEquals(Long.valueOf(11), result.get(0).department.employees.get(0).id);
+        assertEquals(Long.valueOf(22), result.get(0).department.employees.get(1).id);
         assertEquals(Long.valueOf(22), result.get(1).id);
+        assertEquals("22", result.get(1).username);
+        assertEquals("[email protected]", result.get(1).email);
+        assertEquals(result.get(0).department, result.get(1).department);
         assertEquals(Long.valueOf(33), result.get(2).id);
+        assertEquals("33", result.get(2).username);
+        assertEquals("[email protected]", result.get(2).email);
+        assertEquals(null, result.get(2).department);
     }
 
     public void testIdWithJaxbRules() throws Exception