...
diff --git a/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java.orig b/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java.orig
deleted file mode 100644
index d89fbc9..0000000
--- a/src/test/java/com/fasterxml/jackson/databind/ObjectMapperTest.java.orig
+++ /dev/null
@@ -1,203 +0,0 @@
-package com.fasterxml.jackson.databind;
-
-import java.io.*;
-import java.util.*;
-
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.deser.DefaultDeserializationContext;
-import com.fasterxml.jackson.databind.introspect.JacksonAnnotationIntrospector;
-import com.fasterxml.jackson.databind.node.*;
-import com.fasterxml.jackson.databind.type.TypeFactory;
-
-public class ObjectMapperTest extends BaseMapTest
-{
- static class Bean {
- int value = 3;
-
- public void setX(int v) { value = v; }
- }
-
- // for [Issue#206]
- @SuppressWarnings("serial")
- static class CustomMapper extends ObjectMapper {
- @Override
- protected DefaultDeserializationContext createDeserializationContext(JsonParser jp,
- DeserializationConfig cfg) {
- return super.createDeserializationContext(jp, cfg);
- }
- }
-
- @SuppressWarnings("serial")
- static class MyAnnotationIntrospector extends JacksonAnnotationIntrospector { }
-
- /*
- /**********************************************************
- /* Test methods
- /**********************************************************
- */
-
- final static ObjectMapper MAPPER = new ObjectMapper();
-
- public void testProps()
- {
- ObjectMapper m = new ObjectMapper();
- // should have default factory
- assertNotNull(m.getNodeFactory());
- JsonNodeFactory nf = JsonNodeFactory.instance;
- m.setNodeFactory(nf);
- assertNull(m.getInjectableValues());
- assertSame(nf, m.getNodeFactory());
- }
-
- public void testSupport()
- {
- assertTrue(MAPPER.canSerialize(String.class));
- assertTrue(MAPPER.canDeserialize(TypeFactory.defaultInstance().constructType(String.class)));
- }
-
- public void testTreeRead() throws Exception
- {
- String JSON = "{ }";
- JsonNode n = MAPPER.readTree(JSON);
- assertTrue(n instanceof ObjectNode);
-
- n = MAPPER.readTree(new StringReader(JSON));
- assertTrue(n instanceof ObjectNode);
-
- n = MAPPER.readTree(new ByteArrayInputStream(JSON.getBytes("UTF-8")));
- assertTrue(n instanceof ObjectNode);
- }
-
- // Test to ensure that we can check property ordering defaults...
- public void testConfigForPropertySorting() throws Exception
- {
- ObjectMapper m = new ObjectMapper();
-
- // sort-alphabetically is disabled by default:
- assertFalse(m.isEnabled(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY));
- SerializationConfig sc = m.getSerializationConfig();
- assertFalse(sc.isEnabled(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY));
- assertFalse(sc.shouldSortPropertiesAlphabetically());
- DeserializationConfig dc = m.getDeserializationConfig();
- assertFalse(dc.shouldSortPropertiesAlphabetically());
-
- // but when enabled, should be visible:
- m.enable(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY);
- sc = m.getSerializationConfig();
- assertTrue(sc.isEnabled(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY));
- assertTrue(sc.shouldSortPropertiesAlphabetically());
- dc = m.getDeserializationConfig();
- // and not just via SerializationConfig, but also via DeserializationConfig
- assertTrue(dc.isEnabled(MapperFeature.SORT_PROPERTIES_ALPHABETICALLY));
- assertTrue(dc.shouldSortPropertiesAlphabetically());
- }
-
-
- public void testJsonFactoryLinkage()
- {
- // first, implicit factory, giving implicit linkage
- assertSame(MAPPER, MAPPER.getFactory().getCodec());
-
- // and then explicit factory, which should also be implicitly linked
- JsonFactory f = new JsonFactory();
- ObjectMapper m = new ObjectMapper(f);
- assertSame(f, m.getFactory());
- assertSame(m, f.getCodec());
- }
-
- /**
- * Test for verifying working of [JACKSON-191]
- */
- public void testProviderConfig() throws Exception
- {
- ObjectMapper m = new ObjectMapper();
- final String JSON = "{ \"x\" : 3 }";
-
- assertEquals(0, m._deserializationContext._cache.cachedDeserializersCount());
- // and then should get one constructed for:
- Bean bean = m.readValue(JSON, Bean.class);
- assertNotNull(bean);
- // Since 2.6, serializer for int also cached:
- assertEquals(2, m._deserializationContext._cache.cachedDeserializersCount());
- m._deserializationContext._cache.flushCachedDeserializers();
- assertEquals(0, m._deserializationContext._cache.cachedDeserializersCount());
-
- // 07-Nov-2014, tatu: As per [databind#604] verify that Maps also get cached
- m = new ObjectMapper();
- List<?> stuff = m.readValue("[ ]", List.class);
- assertNotNull(stuff);
- // may look odd, but due to "Untyped" deserializer thing, we actually have
- // 4 deserializers (int, List<?>, Map<?,?>, Object)
- assertEquals(4, m._deserializationContext._cache.cachedDeserializersCount());
- }
-
- // [Issue#28]: ObjectMapper.copy()
- public void testCopy() throws Exception
- {
- ObjectMapper m = new ObjectMapper();
- assertTrue(m.isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));
- m.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
- assertFalse(m.isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));
- InjectableValues inj = new InjectableValues.Std();
- m.setInjectableValues(inj);
-
- // // First: verify that handling of features is decoupled:
-
- ObjectMapper m2 = m.copy();
- assertFalse(m2.isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));
- m2.enable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
- assertTrue(m2.isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));
- assertSame(inj, m2.getInjectableValues());
-
- // but should NOT change the original
- assertFalse(m.isEnabled(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES));
-
- // nor vice versa:
- assertFalse(m.isEnabled(DeserializationFeature.UNWRAP_ROOT_VALUE));
- assertFalse(m2.isEnabled(DeserializationFeature.UNWRAP_ROOT_VALUE));
- m.enable(DeserializationFeature.UNWRAP_ROOT_VALUE);
- assertTrue(m.isEnabled(DeserializationFeature.UNWRAP_ROOT_VALUE));
- assertFalse(m2.isEnabled(DeserializationFeature.UNWRAP_ROOT_VALUE));
-
- // // Also, underlying JsonFactory instances should be distinct
-
- assertNotSame(m.getFactory(), m2.getFactory());
-
- // [Issue#122]: Need to ensure mix-ins are not shared
- assertEquals(0, m.getSerializationConfig().mixInCount());
- assertEquals(0, m2.getSerializationConfig().mixInCount());
- assertEquals(0, m.getDeserializationConfig().mixInCount());
- assertEquals(0, m2.getDeserializationConfig().mixInCount());
-
- m.addMixIn(String.class, Integer.class);
- assertEquals(1, m.getSerializationConfig().mixInCount());
- assertEquals(0, m2.getSerializationConfig().mixInCount());
- assertEquals(1, m.getDeserializationConfig().mixInCount());
- assertEquals(0, m2.getDeserializationConfig().mixInCount());
- }
-
- public void testAnnotationIntrospectorCopyin()
- {
- ObjectMapper m = new ObjectMapper();
- m.setAnnotationIntrospector(new MyAnnotationIntrospector());
- assertEquals(MyAnnotationIntrospector.class,
- m.getDeserializationConfig().getAnnotationIntrospector().getClass());
- ObjectMapper m2 = m.copy();
-
- assertEquals(MyAnnotationIntrospector.class,
- m2.getDeserializationConfig().getAnnotationIntrospector().getClass());
- assertEquals(MyAnnotationIntrospector.class,
- m2.getSerializationConfig().getAnnotationIntrospector().getClass());
- }
-
- // For [databind#703]
- public void testNonSerializabilityOfObject()
- {
- ObjectMapper m = new ObjectMapper();
- assertFalse(m.canSerialize(Object.class));
- // but this used to pass, incorrectly
- assertFalse(m.canSerialize(Object.class));
- }
-}
