More unit test fixes; joda, xml ones not getting registered

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/ext/JodaSerializers.java

@@ -21,8 +21,6 @@
  * Since version 1.5, more types are supported. These types use slightly
  * different approach to serialization than core date types: "timestamp"
  * notation is implemented using JSON arrays, for improved readability.
- *
- * @since 1.4
  */
 public class JodaSerializers
     implements Provider<Map.Entry<Class<?>,JsonSerializer<?>>>

src/test/java/com/fasterxml/jackson/databind/jsontype/TestDefaultForEnums.java

@@ -58,7 +58,7 @@ public void testSimpleEnumsInObjectArray() throws Exception
 
         // Typing is needed for enums
         String json = m.writeValueAsString(new Object[] { TestEnum.A });
-        assertEquals("[[\"org.codehaus.jackson.map.jsontype.TestDefaultForEnums$TestEnum\",\"A\"]]", json);
+        assertEquals("[[\"com.fasterxml.jackson.databind.jsontype.TestDefaultForEnums$TestEnum\",\"A\"]]", json);
 
         // and let's verify we get it back ok as well:
         Object[] value = m.readValue(json, Object[].class);
@@ -71,7 +71,7 @@ public void testSimpleEnumsAsField() throws Exception
         ObjectMapper m = new ObjectMapper();
         m.enableDefaultTyping();
         String json = m.writeValueAsString(new EnumHolder(TestEnum.B));
-        assertEquals("{\"value\":[\"org.codehaus.jackson.map.jsontype.TestDefaultForEnums$TestEnum\",\"B\"]}", json);
+        assertEquals("{\"value\":[\"com.fasterxml.jackson.databind.jsontype.TestDefaultForEnums$TestEnum\",\"B\"]}", json);
         EnumHolder holder = m.readValue(json, EnumHolder.class);
         assertSame(TestEnum.B, holder.value);
     }

src/test/java/com/fasterxml/jackson/databind/jsontype/TestDefaultForObject.java

@@ -326,7 +326,7 @@ public void testFeature432() throws Exception
         ObjectMapper mapper = new ObjectMapper();
         mapper.enableDefaultTypingAsProperty(ObjectMapper.DefaultTyping.OBJECT_AND_NON_CONCRETE, "*CLASS*");
         String json = mapper.writeValueAsString(new BeanHolder(new StringBean("punny")));
-        assertEquals("{\"bean\":{\"*CLASS*\":\"org.codehaus.jackson.map.jsontype.TestDefaultForObject$StringBean\",\"name\":\"punny\"}}", json);
+        assertEquals("{\"bean\":{\"*CLASS*\":\"com.fasterxml.jackson.databind.jsontype.TestDefaultForObject$StringBean\",\"name\":\"punny\"}}", json);
     }
 
     /*

src/test/java/com/fasterxml/jackson/databind/jsontype/TestSubtypes.java

@@ -145,7 +145,7 @@ public void testEmptyBean() throws Exception
         mapper.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
         mapper.configure(SerializationConfig.Feature.FAIL_ON_EMPTY_BEANS, false);
         json = mapper.writeValueAsString(new EmptyNonFinal());
-        assertEquals("[\"org.codehaus.jackson.map.jsontype.TestSubtypes$EmptyNonFinal\",{}]", json);
+        assertEquals("[\"com.fasterxml.jackson.databind.jsontype.TestSubtypes$EmptyNonFinal\",{}]", json);
     }
 
     public void testDefaultImpl() throws Exception

src/test/java/com/fasterxml/jackson/databind/jsontype/TestTypedSerialization.java

@@ -196,7 +196,7 @@ public void testTypedMaps() throws Exception
         list.add(new A());
         map.put(1L, list);
         String json = mapper.writerWithType(new TypeReference<Map<Long, Collection<Super>>>() {}).writeValueAsString(map);
-        assertTrue(json, json.contains("@class"));
+        assertTrue("JSON does not contain '@class': "+json, json.contains("@class"));
     }
 }
 

src/test/java/com/fasterxml/jackson/databind/type/TestTypeFactory.java

@@ -268,7 +268,7 @@ public void testCanonicalNames()
         // And then EnumMap (actual use case for us)
         t = tf.constructMapType(EnumMap.class, EnumForCanonical.class, String.class);
         can = t.toCanonical();
-        assertEquals("java.util.EnumMap<org.codehaus.jackson.map.type.TestTypeFactory$EnumForCanonical,java.lang.String>",
+        assertEquals("java.util.EnumMap<com.fasterxml.jackson.databind.type.TestTypeFactory$EnumForCanonical,java.lang.String>",
                 can);
         assertEquals(t, TypeFactory.fromCanonical(can));