Minor test cleanup to make merging to master easier

Author: cowtowncoder

avro/src/test/java/com/fasterxml/jackson/dataformat/avro/RoundtripTest.java

@@ -51,7 +51,7 @@ public org.apache.avro.Schema getSchema() {
     public void testIssue9() throws Exception
     {
         AvroSchema jsch = getEmployeeSchema();
-        ObjectMapper mapper = new ObjectMapper(new AvroFactory());
+        ObjectMapper mapper = new AvroMapper();
 
         ObjectWriter writ = mapper.writer(jsch);
         ObjectMapper unzip = new ObjectMapper();
@@ -62,8 +62,9 @@ public void testIssue9() throws Exception
 
     public void testCharSequences() throws Exception
     {
-        ObjectMapper mapper = new AvroMapper()
-            .enable(JsonGenerator.Feature.IGNORE_UNKNOWN);
+        ObjectMapper mapper = AvroMapper.builder()
+            .enable(JsonGenerator.Feature.IGNORE_UNKNOWN)
+            .build();
         ObjectWriter writ = mapper.writer(CHARSEQ_SCHEMA);
 
         CharSeqBean input = new CharSeqBean();
@@ -86,8 +87,9 @@ public void testCharSequencesLowStringLimit() throws Exception
         AvroFactory factory = AvroFactory.builder()
                 .streamReadConstraints(StreamReadConstraints.builder().maxStringLength(1).build())
                 .build();
-        ObjectMapper mapper = new AvroMapper(factory)
-                .enable(JsonGenerator.Feature.IGNORE_UNKNOWN);
+        ObjectMapper mapper = AvroMapper.builder(factory)
+                .enable(JsonGenerator.Feature.IGNORE_UNKNOWN)
+                .build();
         ObjectWriter writ = mapper.writer(CHARSEQ_SCHEMA);
 
         CharSeqBean input = new CharSeqBean();

protobuf/src/test/java/com/fasterxml/jackson/dataformat/protobuf/ReadSimpleTest.java

@@ -6,6 +6,7 @@
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.core.StreamReadConstraints;
+import com.fasterxml.jackson.databind.DatabindException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
@@ -376,8 +377,8 @@ public void testStringArraySimpleLowLimit() throws Exception
 
         try {
             protobufMapper.readerFor(Strings.class).with(schema).readValue(bytes);
-            fail("Expected JsonMappingException");
-        } catch (JsonMappingException jme) {
+            fail("Expected DatabindException");
+        } catch (DatabindException jme) {
             String message = jme.getMessage();
             assertTrue("unexpected message: " + message,
                     message.startsWith("String length (4) exceeds the maximum length (1)"));