yet more test cleanup

3 files changed, 20 insertions, 34 deletions

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 f3bb44498..10db867e5 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
@@ -1,22 +1,14 @@
 package com.fasterxml.jackson.databind.jsontype.ext;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.*;
 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.*;
 import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
diff --git a/src/test/java/com/fasterxml/jackson/databind/jsontype/ext/TestSubtypesExternalPropertyMissingProperty.java b/src/test/java/com/fasterxml/jackson/databind/jsontype/ext/TestSubtypesExternalPropertyMissingProperty.java
index ac414b3ac..41a2733b1 100644
--- a/src/test/java/com/fasterxml/jackson/databind/jsontype/ext/TestSubtypesExternalPropertyMissingProperty.java
+++ b/src/test/java/com/fasterxml/jackson/databind/jsontype/ext/TestSubtypesExternalPropertyMissingProperty.java
@@ -6,21 +6,13 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo.As;
 import com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
 
 import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.exc.MismatchedInputException;
 
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertSame;
 
 // for [databind#1341]
-public class TestSubtypesExternalPropertyMissingProperty
+public class TestSubtypesExternalPropertyMissingProperty extends BaseMapTest
 {
-    @Rule
-    public ExpectedException thrown = ExpectedException.none();
-
     /**
      * Base class - external property for Fruit subclasses.
      */
@@ -95,7 +87,7 @@ public class TestSubtypesExternalPropertyMissingProperty
         }
     }
 
-    private final ObjectMapper MAPPER = new ObjectMapper();
+    private final ObjectMapper MAPPER = newJsonMapper();
 
     /*
     /**********************************************************
@@ -246,14 +238,20 @@ public class TestSubtypesExternalPropertyMissingProperty
     }
 
     private void checkBoxJsonMappingException(String json) throws Exception {
-        thrown.expect(JsonMappingException.class);
-        thrown.expectMessage("Missing property 'fruit' for external type id 'type'");
-        MAPPER.readValue(json, Box.class);
+        try {
+            MAPPER.readValue(json, Box.class);
+            fail("Should not pass");
+        } catch (MismatchedInputException e) {
+            BaseMapTest.verifyException(e, "Missing property 'fruit' for external type id 'type'");
+        }
     }
 
     private void checkReqBoxJsonMappingException(String json) throws Exception {
-        thrown.expect(JsonMappingException.class);
-        thrown.expectMessage("Missing property 'fruit' for external type id 'type'");
-        MAPPER.readValue(json, ReqBox.class);
+        try {
+            MAPPER.readValue(json, ReqBox.class);
+            fail("Should not pass");
+        } catch (MismatchedInputException e) {
+            BaseMapTest.verifyException(e, "Missing property 'fruit' for external type id 'type'");
+        }
     }
 }    
diff --git a/src/test/java/com/fasterxml/jackson/failing/InnerClassNonStaticCore384Test.java b/src/test/java/com/fasterxml/jackson/failing/InnerClassNonStaticCore384Test.java
index 1390a652f..04bc67091 100644
--- a/src/test/java/com/fasterxml/jackson/failing/InnerClassNonStaticCore384Test.java
+++ b/src/test/java/com/fasterxml/jackson/failing/InnerClassNonStaticCore384Test.java
@@ -5,10 +5,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-import static org.hamcrest.CoreMatchers.instanceOf;
-
-import static org.junit.Assert.assertThat;
-
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.testutil.NoCheckSubTypeValidator;
 
@@ -190,8 +186,8 @@ for (Vehicle v : fleet.vehicles) {
 
         Fleet deserializedFleet = mapper.readValue(serializedFleet, Fleet.class);
 
-        assertThat(deserializedFleet.getVehicles().get(0), instanceOf(Car.class));
-        assertThat(deserializedFleet.getVehicles().get(1), instanceOf(Truck.class));
+        assertTrue(deserializedFleet.getVehicles().get(0) instanceof Car);
+        assertTrue(deserializedFleet.getVehicles().get(1) instanceof Truck);
 
         assertEquals(fleet, deserializedFleet);
     }