Minor test streamlining

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/databind/TestJDKSerialization.java

@@ -66,7 +66,7 @@ public Map<String,Object> properties() {
      *   ObjectMapper here can lead to strange unit test suite failures, so
      *   let's create a private copy for this class only.
      */
-    private final ObjectMapper MAPPER = new ObjectMapper();
+    private final ObjectMapper MAPPER = newJsonMapper();
 
     public void testConfigs() throws IOException
     {
@@ -91,7 +91,7 @@ public void testConfigs() throws IOException
     // for [databind#899]
     public void testEnumHandlers() throws IOException
     {
-        ObjectMapper mapper = new ObjectMapper();
+        ObjectMapper mapper = newJsonMapper();
         // ensure we have serializers and/or deserializers, first
         String json = mapper.writerFor(EnumPOJO.class)
                 .writeValueAsString(new EnumPOJO());
@@ -212,7 +212,7 @@ public void testLRUMap() throws Exception
 
     protected byte[] jdkSerialize(Object o) throws IOException
     {
-        ByteArrayOutputStream bytes = new ByteArrayOutputStream(1000);
+        ByteArrayOutputStream bytes = new ByteArrayOutputStream(2000);
         ObjectOutputStream obOut = new ObjectOutputStream(bytes);
         obOut.writeObject(o);
         obOut.close();

src/test/java/com/fasterxml/jackson/databind/access/TestAnyGetterAccess.java

@@ -51,7 +51,7 @@ public Map<?,?> getProperties()
     /**********************************************************
      */
 
-    private final ObjectMapper MAPPER = new ObjectMapper();
+    private final ObjectMapper MAPPER = newJsonMapper();
 
     public void testDynaBean() throws Exception
     {

src/test/java/com/fasterxml/jackson/databind/big/TestBiggerData.java

@@ -72,10 +72,11 @@ static class Area {
     /**********************************************************
      */
 
+	private final ObjectMapper MAPPER = newJsonMapper();
+
 	public void testReading() throws Exception
 	{
-		ObjectMapper mapper = objectMapper();
-		Citm citm = mapper.readValue(getClass().getResourceAsStream("/data/citm_catalog.json"),
+		Citm citm = MAPPER.readValue(getClass().getResourceAsStream("/data/citm_catalog.json"),
 				Citm.class);
 		assertNotNull(citm);
 		assertNotNull(citm.areaNames);
@@ -99,14 +100,13 @@ public void testReading() throws Exception
 
 	public void testRoundTrip() throws Exception
 	{
-		ObjectMapper mapper = objectMapper();
-		Citm citm = mapper.readValue(getClass().getResourceAsStream("/data/citm_catalog.json"),
+		Citm citm = MAPPER.readValue(getClass().getResourceAsStream("/data/citm_catalog.json"),
 				Citm.class);
 
-		ObjectWriter w = mapper.writerWithDefaultPrettyPrinter();
+		ObjectWriter w = MAPPER.writerWithDefaultPrettyPrinter();
 
 		String json1 = w.writeValueAsString(citm);
-		Citm citm2 = mapper.readValue(json1, Citm.class);
+		Citm citm2 = MAPPER.readValue(json1, Citm.class);
 		String json2 = w.writeValueAsString(citm2);
 
 		assertEquals(json1, json2);

src/test/java/com/fasterxml/jackson/databind/contextual/TestContextualDeserialization.java

@@ -14,6 +14,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.deser.ContextualDeserializer;
 import com.fasterxml.jackson.databind.deser.std.StdScalarDeserializer;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 
 /**
@@ -181,6 +182,12 @@ static class GenericBean {
     /**********************************************************
      */
 
+    private final ObjectMapper ANNOTATED_CTXT_MAPPER = JsonMapper.builder()
+            .addModule(new SimpleModule("test", Version.unknownVersion())
+                    .addDeserializer(StringValue.class, new AnnotatedContextualDeserializer()
+            ))
+            .build();
+    
     public void testSimple() throws Exception
     {
         ObjectMapper mapper = new ObjectMapper();
@@ -296,12 +303,7 @@ public void testContextualType() throws Exception {
     /**********************************************************
      */
 
-    private ObjectMapper _mapperWithAnnotatedContextual()
-    {
-        ObjectMapper mapper = new ObjectMapper();
-        SimpleModule module = new SimpleModule("test", Version.unknownVersion());
-        module.addDeserializer(StringValue.class, new AnnotatedContextualDeserializer());
-        mapper.registerModule(module);
-        return mapper;
+    private ObjectMapper _mapperWithAnnotatedContextual() {
+        return ANNOTATED_CTXT_MAPPER;
     }
 }

src/test/java/com/fasterxml/jackson/databind/deser/creators/ImplicitNameMatch792Test.java

@@ -89,7 +89,7 @@ public String asString() {
     /**********************************************************
      */
 
-    private final ObjectMapper MAPPER = objectMapper();
+    private final ObjectMapper MAPPER = sharedMapper();
 
     public void testBindingOfImplicitCreatorNames() throws Exception
     {

src/test/java/com/fasterxml/jackson/databind/ser/TestArraySerialization.java

@@ -6,7 +6,7 @@
 public class TestArraySerialization
     extends BaseMapTest
 {
-    private final ObjectMapper MAPPER = objectMapper();
+    private final ObjectMapper MAPPER = newJsonMapper();
 
     public void testLongStringArray() throws Exception
     {

src/test/java/com/fasterxml/jackson/databind/util/TestObjectBuffer.java

@@ -29,7 +29,7 @@ public void testTyped()
     private void _testObjectBuffer(Class<?> clz)
     {
         int[] SIZES = new int[] {
-            3, 19, 99, 1007, 79000, 256001
+            3, 19, 99, 1007, 19999, 99001
         };
 
         // Let's loop separately for reused instance, new instance