test cleanup

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/DeserializationConfig.java

@@ -863,14 +863,6 @@ public BeanDescription introspectForCreation(JavaType type) {
         return getClassIntrospector().forCreation(this, type, this);
     }
 
-    /**
-     * @since 2.0
-     * @deprecated Since 2.12 - use variant that takes both builder and value type
-     */
-    public BeanDescription introspectForBuilder(JavaType type) {
-        return getClassIntrospector().forDeserializationWithBuilder(this, type, this);
-    }
-
     /**
      * @since 2.12
      */
@@ -879,6 +871,15 @@ public BeanDescription introspectForBuilder(JavaType builderType, BeanDescriptio
                 builderType, this, valueTypeDesc);
     }
 
+    /**
+     * @since 2.0
+     * @deprecated Since 2.12 - use variant that takes both builder and value type
+     */
+    @Deprecated
+    public BeanDescription introspectForBuilder(JavaType type) {
+        return getClassIntrospector().forDeserializationWithBuilder(this, type, this);
+    }
+
     /*
     /**********************************************************
     /* Support for polymorphic type handling

src/test-jdk14/java/com/fasterxml/jackson/databind/RecordTest.java

@@ -7,6 +7,9 @@
 import com.fasterxml.jackson.databind.util.ClassUtil;
 
 import java.io.IOException;
+import java.util.Collections;
+import java.util.LinkedHashMap;
+import java.util.Map;
 
 public class RecordTest extends BaseMapTest
 {
@@ -66,22 +69,21 @@ public void testSerializeSimpleRecord() throws JsonProcessingException {
         SimpleRecord record = new SimpleRecord(123, "Bob");
 
         String json = MAPPER.writeValueAsString(record);
-
-        assertEquals("{\"id\":123,\"name\":\"Bob\"}", json);
+        final Object EXP = map("id", Integer.valueOf(123), "name", "Bob");
+        assertEquals(EXP, MAPPER.readValue(json, Object.class));
     }
 
     public void testDeserializeSimpleRecord() throws IOException {
         SimpleRecord value = MAPPER.readValue("{\"id\":123,\"name\":\"Bob\"}", SimpleRecord.class);
-
         assertEquals(new SimpleRecord(123, "Bob"), value);
     }
 
     public void testSerializeRecordOfRecord() throws JsonProcessingException {
         RecordOfRecord record = new RecordOfRecord(new SimpleRecord(123, "Bob"));
-
         String json = MAPPER.writeValueAsString(record);
-
-        assertEquals("{\"record\":{\"id\":123,\"name\":\"Bob\"}}", json);
+        final Object EXP = Collections.singletonMap("record",
+                map("id", Integer.valueOf(123), "name", "Bob"));
+        assertEquals(EXP, MAPPER.readValue(json, Object.class));
     }
 
     /*
@@ -125,22 +127,30 @@ public void testSerializeJsonIgnoreRecord() throws JsonProcessingException {
     }
 
     public void testDeserializeRecordWithConstructor() throws IOException {
-        RecordWithConstructor value = MAPPER.readValue("{\"id\":123,\"name\":\"Bob\"}", RecordWithConstructor.class);
-
+        RecordWithConstructor value = MAPPER.readValue("{\"id\":123,\"name\":\"Bob\"}",
+                RecordWithConstructor.class);
         assertEquals(new RecordWithConstructor(123, "Bob"), value);
     }
 
     public void testSerializeJsonRenameRecord() throws JsonProcessingException {
         JsonPropertyRenameRecord record = new JsonPropertyRenameRecord(123, "Bob");
 
         String json = MAPPER.writeValueAsString(record);
-
-        assertEquals("{\"id\":123,\"rename\":\"Bob\"}", json);
+        final Object EXP = map("id", Integer.valueOf(123), "rename", "Bob");
+        assertEquals(EXP, MAPPER.readValue(json, Object.class));
     }
 
     public void testDeserializeJsonRenameRecord() throws IOException {
-        JsonPropertyRenameRecord value = MAPPER.readValue("{\"id\":123,\"rename\":\"Bob\"}", JsonPropertyRenameRecord.class);
-
+        JsonPropertyRenameRecord value = MAPPER.readValue("{\"id\":123,\"rename\":\"Bob\"}",
+                JsonPropertyRenameRecord.class);
         assertEquals(new JsonPropertyRenameRecord(123, "Bob"), value);
     }
+
+    private Map<String,Object> map(String key1, Object value1,
+            String key2, Object value2) {
+        final Map<String, Object> result = new LinkedHashMap<>();
+        result.put(key1, value1);
+        result.put(key2, value2);
+        return result;
+    }
 }