Post-merge moving of tests wrt #4777

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/databind/deser/OrderMapEntriesByKeysSerializationFeature4773Test.java renamed to src/test/java/com/fasterxml/jackson/databind/ser/jdk/MapSerializationSorted4773Test.java

@@ -1,11 +1,11 @@
-package com.fasterxml.jackson.databind.deser;
-
-import org.junit.jupiter.api.Test;
+package com.fasterxml.jackson.databind.ser.jdk;
 
 import java.util.Currency;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.junit.jupiter.api.Test;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.exc.InvalidDefinitionException;
@@ -15,10 +15,9 @@
 
 // [databind#4773] Test to verify `SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS` behavior
 //     when serializing `Map` instances with un-comparable keys.
-public class OrderMapEntriesByKeysSerializationFeature4773Test
+public class MapSerializationSorted4773Test
         extends DatabindTestUtil
 {
-
     public static class IncomparableContainer4773 {
         public Map<Currency, String> exampleMap = new HashMap<>();
     }

src/test/java/com/fasterxml/jackson/databind/tofix/AaaCreator4777Test.java

@@ -0,0 +1,74 @@
+package com.fasterxml.jackson.databind.tofix;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.deser.*;
+import com.fasterxml.jackson.databind.deser.std.StdValueInstantiator;
+import com.fasterxml.jackson.databind.json.JsonMapper;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.testutil.DatabindTestUtil;
+
+public class AaaCreator4777Test extends DatabindTestUtil
+{
+    static class Foo {
+        String whoMadeWho;
+
+        protected Foo() { whoMadeWho = "creator"; } 
+        
+        @JsonCreator
+        static Foo create() {
+            Foo foo = new Foo();
+            foo.whoMadeWho = "factory";
+            return foo;
+        }
+    }
+
+    @SuppressWarnings("serial")
+    static class Instantiator extends StdValueInstantiator {
+        public Instantiator(StdValueInstantiator src) {
+            super(src);
+        }
+    }
+
+    static class Instantiators implements ValueInstantiators {
+        Instantiator last = null;
+
+        @Override
+        public ValueInstantiator findValueInstantiator(
+                DeserializationConfig config,
+                BeanDescription beanDesc,
+                ValueInstantiator defaultInstantiator
+        ) {
+            if (defaultInstantiator instanceof StdValueInstantiator) {
+                Instantiator instantiator = new Instantiator((StdValueInstantiator) defaultInstantiator);
+                last = instantiator;
+                return instantiator;
+            } else {
+                return defaultInstantiator;
+            }
+        }
+    }
+
+    @Test
+    public void test() throws Exception {
+        Instantiators i = new Instantiators();
+
+        SimpleModule sm = new SimpleModule() {
+            @Override
+            public void setupModule(SetupContext context) {
+                super.setupModule(context);
+                context.addValueInstantiators(i);
+            }
+        };
+        ObjectMapper mapper = JsonMapper.builder().addModule(sm).build();
+
+        Foo result = mapper.readValue("{}", Foo.class);
+
+        Assertions.assertEquals("factory", result.whoMadeWho);
+        
+        Assertions.assertNull(i.last.getWithArgsCreator());
+    }
+}