Improve java14/record tests

Author: cowtowncoder

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

@@ -9,39 +9,12 @@
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-public class RecordTest extends BaseMapTest
+public class RecordBasicsTest extends BaseMapTest
 {
     record SimpleRecord(int id, String name) { }
 
     record RecordOfRecord(SimpleRecord record) { }
 
-    record RecordWithCanonicalCtorOverride(int id, String name) {
-        public RecordWithCanonicalCtorOverride(int id, String name) {
-            this.id = id;
-            this.name = "name";
-        }
-    }
-
-    record RecordWithAltCtor(int id, String name) {
-        @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
-        public RecordWithAltCtor(@JsonProperty("id") int id) {
-            this(id, "name2");
-        }
-    }
-
-    // [databind#2980]
-    record RecordWithDelegation(String value) {
-        @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
-        public RecordWithDelegation(String value) {
-            this.value = "del:"+value;
-        }
-
-        @JsonValue()
-        public String getValue() {
-            return "val:"+value;
-        }
-    }
-
     record RecordWithIgnore(int id, @JsonIgnore String name) { }
 
     record RecordWithRename(int id, @JsonProperty("rename")String name) { }
@@ -134,35 +107,6 @@ public void testDeserializeSimpleRecord_DisableAnnotationIntrospector() throws E
         assertEquals(new SimpleRecord(123, "Bob"), value);
     }
 
-    /*
-    /**********************************************************************
-    /* Test methods, alternate constructors
-    /**********************************************************************
-     */
-
-    public void testDeserializeWithCanonicalCtorOverride() throws Exception {
-        RecordWithCanonicalCtorOverride value = MAPPER.readValue("{\"id\":123,\"name\":\"Bob\"}",
-                RecordWithCanonicalCtorOverride.class);
-        assertEquals(123, value.id());
-        assertEquals("name", value.name());
-    }
-
-    public void testDeserializeWithAltCtor() throws Exception {
-        RecordWithAltCtor value = MAPPER.readValue("{\"id\":2812}",
-                RecordWithAltCtor.class);
-        assertEquals(2812, value.id());
-        assertEquals("name2", value.name());
-    }
-
-    // [databind#2980]
-    public void testDeserializeWithDelegatingCtor() throws Exception {
-        RecordWithDelegation value = MAPPER.readValue(q("foobar"),
-                RecordWithDelegation.class);
-        assertEquals("del:foobar", value.getValue());
-
-        assertEquals(q("val:del:foobar"), MAPPER.writeValueAsString(value));
-    }
-
     /*
     /**********************************************************************
     /* Test methods, ignorals, renames

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

@@ -0,0 +1,66 @@
+package com.fasterxml.jackson.databind;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public class RecordCreatorsTest extends BaseMapTest
+{
+    record RecordWithCanonicalCtorOverride(int id, String name) {
+        public RecordWithCanonicalCtorOverride(int id, String name) {
+            this.id = id;
+            this.name = "name";
+        }
+    }
+
+    record RecordWithAltCtor(int id, String name) {
+        @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
+        public RecordWithAltCtor(@JsonProperty("id") int id) {
+            this(id, "name2");
+        }
+    }
+
+    // [databind#2980]
+    record RecordWithDelegation(String value) {
+        @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
+        public RecordWithDelegation(String value) {
+            this.value = "del:"+value;
+        }
+
+        @JsonValue()
+        public String getValue() {
+            return "val:"+value;
+        }
+    }
+
+    private final ObjectMapper MAPPER = newJsonMapper();
+
+    /*
+    /**********************************************************************
+    /* Test methods, alternate constructors
+    /**********************************************************************
+     */
+
+    public void testDeserializeWithCanonicalCtorOverride() throws Exception {
+        RecordWithCanonicalCtorOverride value = MAPPER.readValue("{\"id\":123,\"name\":\"Bob\"}",
+                RecordWithCanonicalCtorOverride.class);
+        assertEquals(123, value.id());
+        assertEquals("name", value.name());
+    }
+
+    public void testDeserializeWithAltCtor() throws Exception {
+        RecordWithAltCtor value = MAPPER.readValue("{\"id\":2812}",
+                RecordWithAltCtor.class);
+        assertEquals(2812, value.id());
+        assertEquals("name2", value.name());
+    }
+
+    // [databind#2980]
+    public void testDeserializeWithDelegatingCtor() throws Exception {
+        RecordWithDelegation value = MAPPER.readValue(q("foobar"),
+                RecordWithDelegation.class);
+        assertEquals("del:foobar", value.getValue());
+
+        assertEquals(q("val:del:foobar"), MAPPER.writeValueAsString(value));
+    }
+}

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

@@ -5,7 +5,7 @@
 
 import com.fasterxml.jackson.annotation.JsonSetter;
 import com.fasterxml.jackson.annotation.Nulls;
-import com.fasterxml.jackson.databind.RecordTest.RecordWithRename;
+import com.fasterxml.jackson.databind.RecordBasicsTest.RecordWithRename;
 import com.fasterxml.jackson.databind.exc.InvalidNullException;
 
 public class RecordWithJsonSetter2974Test extends BaseMapTest