diff options
author | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-08-02 17:13:08 -0700 |
---|---|---|
committer | Tatu Saloranta <tatu.saloranta@iki.fi> | 2020-08-02 17:13:08 -0700 |
commit | 5fd87442fb071f4a9f6186a540f89234adcac018 (patch) | |
tree | 19ddc43b6c0e0d3c5642a8f9b3758f5f69735bae | |
parent | 4663696392d240dec438497e2bb61eaadebd4dad (diff) | |
download | jackson-databind-5fd87442fb071f4a9f6186a540f89234adcac018.tar.gz |
Test refactoring (remove warning)
2 files changed, 10 insertions, 8 deletions
diff --git a/src/test/java/com/fasterxml/jackson/databind/BaseTest.java b/src/test/java/com/fasterxml/jackson/databind/BaseTest.java index 48d20fbe9..f917f17d5 100644 --- a/src/test/java/com/fasterxml/jackson/databind/BaseTest.java +++ b/src/test/java/com/fasterxml/jackson/databind/BaseTest.java @@ -344,7 +344,7 @@ public abstract class BaseTest assertTrue("Should have positive line number", location.getLineNr() > 0); } - protected void verifyException(Throwable e, String... matches) + public static void verifyException(Throwable e, String... matches) { String msg = e.getMessage(); String lmsg = (msg == null) ? "" : msg.toLowerCase(); diff --git a/src/test/java/com/fasterxml/jackson/databind/jsontype/ext/TestPropertyCreatorSubtypesExternalPropertyMissingProperty.java b/src/test/java/com/fasterxml/jackson/databind/jsontype/ext/TestPropertyCreatorSubtypesExternalPropertyMissingProperty.java index ac75229c2..f3bb44498 100644 --- a/src/test/java/com/fasterxml/jackson/databind/jsontype/ext/TestPropertyCreatorSubtypesExternalPropertyMissingProperty.java +++ b/src/test/java/com/fasterxml/jackson/databind/jsontype/ext/TestPropertyCreatorSubtypesExternalPropertyMissingProperty.java @@ -7,11 +7,12 @@ import com.fasterxml.jackson.annotation.JsonSubTypes.Type; import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.annotation.JsonTypeInfo.As; import com.fasterxml.jackson.annotation.JsonTypeInfo.Id; - +import com.fasterxml.jackson.databind.BaseMapTest; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectReader; +import com.fasterxml.jackson.databind.exc.MismatchedInputException; import org.junit.Rule; import org.junit.Test; @@ -20,13 +21,11 @@ import org.junit.rules.ExpectedException; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertSame; +import static org.junit.Assert.fail; // for [databind#2404] public class TestPropertyCreatorSubtypesExternalPropertyMissingProperty { - @Rule - public ExpectedException thrown = ExpectedException.none(); - /** * Base class - external property for Fruit subclasses. */ @@ -243,8 +242,11 @@ public class TestPropertyCreatorSubtypesExternalPropertyMissingProperty } private void checkBoxJsonMappingException(ObjectReader reader, String json) throws Exception { - thrown.expect(JsonMappingException.class); - thrown.expectMessage("Missing property 'fruit' for external type id 'type'"); - reader.readValue(json); + try { + reader.readValue(json); + fail("Should not pass"); + } catch (MismatchedInputException e) { + BaseMapTest.verifyException(e, "Missing property 'fruit' for external type id 'type'"); + } } } |