Fix compatibility probs with latest 3.0 databind

Author: cowtowncoder

avro/src/test/java/tools/jackson/dataformat/avro/SimpleGenerationTest.java renamed to avro/src/test/java/tools/jackson/dataformat/avro/SimpleAvroGenerationTest.java

@@ -7,12 +7,13 @@
 
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
 
+import tools.jackson.core.JacksonException;
 import tools.jackson.core.StreamWriteFeature;
 
 import tools.jackson.databind.DatabindException;
 import tools.jackson.databind.ObjectMapper;
 
-public class SimpleGenerationTest extends AvroTestBase
+public class SimpleAvroGenerationTest extends AvroTestBase
 {
     protected final String SCHEMA_WITH_BINARY_JSON_SRC = "{\n"
             +"\"type\": \"record\",\n"
@@ -61,7 +62,7 @@ public BinaryAndArray(String name) {
 
     private final AvroSchema SCHEMA_WITH_BINARY_JSON;
 
-    public SimpleGenerationTest() throws IOException
+    public SimpleAvroGenerationTest() throws IOException
     {
         SCHEMA_WITH_BINARY_JSON = getMapper().schemaFrom(SCHEMA_WITH_BINARY_JSON_SRC);
     }
@@ -120,7 +121,7 @@ public void testIgnoringOfUnknownScalar() throws Exception
         try {
              mapper.writer(SCHEMA_WITH_BINARY_JSON).writeValue(b, input);
              fail("Should have thrown exception");
-        } catch (DatabindException e) {
+        } catch (JacksonException e) {
             verifyException(e, "no field named");
         }
 
@@ -146,7 +147,7 @@ public void testIgnoringOfUnknownObject() throws Exception
         try {
              mapper.writer(SCHEMA_WITH_BINARY_JSON).writeValueAsBytes(input);
              fail("Should have thrown exception");
-        } catch (DatabindException e) {
+        } catch (JacksonException e) {
             verifyException(e, "no field named 'stuff'");
         }
 

avro/src/test/java/tools/jackson/dataformat/avro/interop/annotations/UnionTest.java

@@ -6,15 +6,15 @@
 import java.util.List;
 import java.util.Map;
 
-import tools.jackson.databind.DatabindException;
+import org.junit.Test;
+
+import tools.jackson.core.JacksonException;
 import tools.jackson.dataformat.avro.interop.InteropTestBase;
 
 import org.apache.avro.UnresolvedUnionException;
 import org.apache.avro.reflect.Nullable;
 import org.apache.avro.reflect.Union;
 
-import org.junit.Test;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.Assert.fail;
 
@@ -144,7 +144,7 @@ public void testInterfaceUnionWithBird() throws IOException {
         try {
             roundTrip(cage);
             fail("Should throw exception about Bird not being in union");
-        } catch (UnresolvedUnionException | DatabindException e) {
+        } catch (UnresolvedUnionException | JacksonException e) {
             // success
         }
     }

ion/src/test/java/tools/jackson/dataformat/ion/IonGeneratorTest.java

@@ -31,8 +31,8 @@
 import com.amazon.ion.system.IonSystemBuilder;
 
 import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.startsWith;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 
 public class IonGeneratorTest {
@@ -127,8 +127,7 @@ public void testWriteFieldNameFailsInSexp() throws Exception {
             joiGenerator.writeName("foo");
             fail("Should not pass");
         } catch (StreamWriteException e) {
-            assertEquals("Can not write a property name, expecting a value",
-                    e.getMessage());
+            assertThat(e.getMessage(), startsWith("Can not write a property name, expecting a value"));
         }
     }
 
@@ -139,8 +138,7 @@ public void testWriteStartSexpFailsWithoutWriteFieldName() throws Exception {
             joiGenerator.writeStartSexp();
             fail("Should not pass");
         } catch (StreamWriteException e) {
-            assertEquals("Can not start a sexp, expecting a property name",
-                    e.getMessage());
+            assertThat(e.getMessage(), startsWith("Can not start a sexp, expecting a property name"));
         }
     }
 }

ion/src/test/java/tools/jackson/dataformat/ion/dos/CyclicIonDataSerTest.java

@@ -3,13 +3,14 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.junit.Test;
+
 import tools.jackson.core.StreamWriteConstraints;
+import tools.jackson.core.exc.StreamConstraintsException;
 import tools.jackson.databind.*;
 
 import tools.jackson.dataformat.ion.IonObjectMapper;
 
-import org.junit.Test;
-
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -28,7 +29,7 @@ public void testListWithSelfReference() throws Exception {
         try {
             MAPPER.writeValueAsBytes(list);
             fail("expected DatabindException");
-        } catch (DatabindException e) {
+        } catch (StreamConstraintsException e) {
             String exceptionPrefix = String.format("Document nesting depth (%d) exceeds the maximum allowed",
                     StreamWriteConstraints.DEFAULT_MAX_DEPTH + 1);
             assertTrue("DatabindException message is as expected?",

protobuf/src/test/java/tools/jackson/dataformat/protobuf/ReadSimpleTest.java renamed to protobuf/src/test/java/tools/jackson/dataformat/protobuf/ReadSimpleProtobufTest.java

@@ -9,14 +9,14 @@
 import tools.jackson.core.JsonToken;
 import tools.jackson.core.StreamReadConstraints;
 import tools.jackson.core.StreamReadFeature;
-import tools.jackson.databind.DatabindException;
+import tools.jackson.core.exc.StreamConstraintsException;
 import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.ObjectWriter;
 
 import tools.jackson.dataformat.protobuf.schema.ProtobufSchema;
 import tools.jackson.dataformat.protobuf.schema.ProtobufSchemaLoader;
 
-public class ReadSimpleTest extends ProtobufTestBase
+public class ReadSimpleProtobufTest extends ProtobufTestBase
 {
     final protected static String PROTOC_STRINGS =
             "message Strings {\n"
@@ -450,8 +450,8 @@ public void testStringArraySimpleLowLimit() throws Exception
 
         try {
             protobufMapper.readerFor(Strings.class).with(schema).readValue(bytes);
-            fail("Expected DatabindException");
-        } catch (DatabindException jme) {
+            fail("Expected StreamConstraintsException");
+        } catch (StreamConstraintsException jme) {
             String message = jme.getMessage();
             assertTrue("unexpected message: " + message,
                     message.startsWith("String value length (4) exceeds the maximum allowed"));

protobuf/src/test/java/tools/jackson/dataformat/protobuf/WriteErrorsTest.java

@@ -4,7 +4,7 @@
 
 import tools.jackson.core.JsonGenerator;
 import tools.jackson.core.StreamWriteFeature;
-
+import tools.jackson.core.exc.StreamWriteException;
 import tools.jackson.databind.DatabindException;
 import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.ObjectWriter;
@@ -41,7 +41,7 @@ public void testUnknownProperties() throws Exception
             /*byte[] bytes =*/ w
                 .without(StreamWriteFeature.IGNORE_UNKNOWN)
                 .writeValueAsBytes(new Point3D(1, 2, 3));
-        } catch (DatabindException e) {
+        } catch (StreamWriteException e) {
             verifyException(e, "Unrecognized field 'z'");
         }