Clean up test for #47; have a look at how implement, realizing that it's... a pain to implement.

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/ser/std/StdKeySerializers.java

@@ -30,16 +30,19 @@ public static JsonSerializer<Object> getStdKeySerializer(JavaType keyType)
         if (cls == String.class) {
             return DEFAULT_STRING_SERIALIZER;
         }
-        if (cls == Object.class) {
+        if (cls == Object.class || cls.isPrimitive() || Number.class.isAssignableFrom(cls)) {
             return DEFAULT_KEY_SERIALIZER;
         }
-        // [JACKSON-606] special handling for dates...
         if (Date.class.isAssignableFrom(cls)) {
             return (JsonSerializer<Object>) DateKeySerializer.instance;
         }
         if (Calendar.class.isAssignableFrom(cls)) {
             return (JsonSerializer<Object>) CalendarKeySerializer.instance;
         }
+        /* 14-Mar-2014, tatu: Should support @JsonValue, as per #47; but that
+         *   requires extensive introspection, and passing in more information
+         *   to this method.
+         */
         // If no match, just use default one:
         return DEFAULT_KEY_SERIALIZER;
     }

src/test/java/com/fasterxml/jackson/failing/TestMapJsonValueKey.java

@@ -5,45 +5,40 @@
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonValue;
-import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.BaseMapTest;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.test.BaseTest;
 
-public class TestMapJsonValueKey extends BaseTest
+// [Issue#47]
+public class TestMapJsonValueKey extends BaseMapTest
 {
     public static class Wat
     {
         private final String wat;
 
         @JsonCreator
-        Wat(String wat)
-        {
+        Wat(String wat) {
             this.wat = wat;
         }
 
         @JsonValue
-        public String getWat()
-        {
+        public String getWat() {
             return wat;
         }
 
         @Override
-        public String toString()
-        {
-            return "[Wat: " + wat + "]";
+        public String toString() {
+            return "(String)[Wat: " + wat + "]";
         }
     }
 
     public void testMapJsonValueKey()
     throws Exception
     {
-        Map<Wat, Boolean> map = new HashMap<Wat, Boolean>();
-        map.put(new Wat("3"), true);
-        map.put(new Wat("x"), false);
-
-        TypeReference<Map<Wat, Boolean>> type = new TypeReference<Map<Wat, Boolean>>(){};
+        Map<Wat, Boolean> input = new HashMap<Wat, Boolean>();
+        input.put(new Wat("3"), true);
 
         ObjectMapper mapper = new ObjectMapper();
-        assertEquals(map, mapper.readValue(mapper.writeValueAsBytes(map), type));
+        String json = mapper.writeValueAsString(input);
+        assertEquals(aposToQuotes("{'3':'true'}"), json);
     }
 }