use assertInstanceOf

Author: pjfanning

avro/src/test/java/tools/jackson/dataformat/avro/JDKSerializabilityTest.java

@@ -49,10 +49,8 @@ private AvroMapper serializeAndDeserialize(AvroMapper mapper) throws Exception {
 
         ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(serializedBytes);
         ObjectInputStream inputStream = new ObjectInputStream(byteArrayInputStream);
-        Object deserializedObject = inputStream.readObject();
-        assertTrue(deserializedObject instanceof AvroMapper,
+        return assertInstanceOf(AvroMapper.class, inputStream.readObject(),
                 "Deserialized object should be an instance of ObjectMapper");
-        return (AvroMapper) deserializedObject;
     }
 
     private Employee _simpleEmployee() {

avro/src/test/java/tools/jackson/dataformat/avro/MapWithUnionTest.java

@@ -124,9 +124,7 @@ public void testMapContainerWithNested() throws Exception
         assertEquals(3, deserialized.props.size());
         assertEquals("world", deserialized.props.get("hello"));
         assertEquals("charlie", deserialized.props.get("goodbye"));
-        Object ob = deserialized.props.get("otherMap");
-        assertTrue(ob instanceof Map<?,?>);
-        Map<?,?> m = (Map<?,?>) ob;
+        Map<?,?> m = assertInstanceOf(Map.class, deserialized.props.get("otherMap"));
         assertEquals("bar", m.get("foo"));
         assertEquals("bing", m.get("zap"));
     }
@@ -178,7 +176,7 @@ public void testUnionResolvingToMapType() throws Exception
                 .with(schema)
                 .readValue(bytes);
         assertNotNull(result.get("data"));
-        assertTrue(result.get("data") instanceof Map,
+        assertInstanceOf(Map.class, result.get("data"),
                 "Expected Map but got " + result.get("data").getClass().getSimpleName());
         Map<String, String> dataMap = (Map<String, String>) result.get("data");
         assertEquals("val1", dataMap.get("key1"));

cbor/src/test/java/tools/jackson/dataformat/cbor/mapper/AnySetterTest.java

@@ -217,9 +217,7 @@ public void testSimpleMapImitation() throws Exception
         assertEquals(3, result.size());
         assertEquals(Integer.valueOf(3), result.get("a"));
         assertEquals(Boolean.TRUE, result.get("b"));
-        Object ob = result.get("c");
-        assertTrue(ob instanceof List<?>);
-        List<?> l = (List<?>)ob;
+        List<?> l = assertInstanceOf(List.class, result.get("c"));
         assertEquals(3, l.size());
         assertEquals(Integer.valueOf(3), l.get(2));
     }
@@ -300,8 +298,7 @@ public void testPolymorphic() throws Exception
         assertEquals(1, result.props.size());
         Base ob = result.props.get("a");
         assertNotNull(ob);
-        assertTrue(ob instanceof Impl);
-        assertEquals("xyz", ((Impl) ob).value);
+        assertEquals("xyz", assertInstanceOf(Impl.class, ob).value);
     }
 
     @Test
@@ -344,9 +341,9 @@ public void testGenericAnySetter() throws Exception
         assertNotNull(stringGeneric);
         assertEquals(stringGeneric.getStaticallyMappedProperty(), "Test");
         for(Map.Entry<String, Integer> entry : stringGeneric.getDynamicallyMappedProperties().entrySet()) {
-            assertTrue(entry.getKey() instanceof String,
+            assertInstanceOf(String.class, entry.getKey(),
                     "A key in MyGeneric<String> is not an String.");
-            assertTrue(entry.getValue() instanceof Integer,
+            assertInstanceOf(Integer.class, entry.getValue(),
                     "A value in MyGeneric<Integer> is not an Integer.");
         }
         assertEquals(stringGeneric.getDynamicallyMappedProperties(), stringGenericMap);

cbor/src/test/java/tools/jackson/dataformat/cbor/mapper/JDKSerializabilityTest.java

@@ -45,10 +45,8 @@ private CBORMapper serializeAndDeserialize(CBORMapper mapper) throws Exception {
 
         ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(serializedBytes);
         ObjectInputStream inputStream = new ObjectInputStream(byteArrayInputStream);
-        Object deserializedObject = inputStream.readObject();
-        assertTrue(deserializedObject instanceof CBORMapper,
+        return assertInstanceOf(CBORMapper.class, inputStream.readObject(),
                 "Deserialized object should be an instance of ObjectMapper");
-        return (CBORMapper) deserializedObject;
     }
 
     private Object _simpleData() {

smile/src/test/java/tools/jackson/dataformat/smile/mapper/AnySetterTest.java

@@ -213,9 +213,7 @@ public void testSimpleMapImitation() throws Exception
         assertEquals(3, result.size());
         assertEquals(Integer.valueOf(3), result.get("a"));
         assertEquals(Boolean.TRUE, result.get("b"));
-        Object ob = result.get("c");
-        assertTrue(ob instanceof List<?>);
-        List<?> l = (List<?>)ob;
+        List<?> l = assertInstanceOf(List.class, result.get("c"));
         assertEquals(3, l.size());
         assertEquals(Integer.valueOf(3), l.get(2));
     }
@@ -296,8 +294,7 @@ public void testPolymorphic() throws Exception
         assertEquals(1, result.props.size());
         Base ob = result.props.get("a");
         assertNotNull(ob);
-        assertTrue(ob instanceof Impl);
-        assertEquals("xyz", ((Impl) ob).value);
+        assertEquals("xyz", assertInstanceOf(Impl.class, ob).value);
     }
 
     @Test
@@ -340,9 +337,9 @@ public void testGenericAnySetter() throws Exception
         assertNotNull(stringGeneric);
         assertEquals(stringGeneric.getStaticallyMappedProperty(), "Test");
         for(Map.Entry<String, Integer> entry : stringGeneric.getDynamicallyMappedProperties().entrySet()) {
-            assertTrue(entry.getKey() instanceof String,
+            assertInstanceOf(String.class, entry.getKey(),
                     "A key in MyGeneric<String> is not an String.");
-            assertTrue(entry.getValue() instanceof Integer,
+            assertInstanceOf(Integer.class, entry.getValue(),
                     "A value in MyGeneric<Integer> is not an Integer.");
         }
         assertEquals(stringGeneric.getDynamicallyMappedProperties(), stringGenericMap);

smile/src/test/java/tools/jackson/dataformat/smile/mapper/JDKSerializabilityTest.java

@@ -45,10 +45,8 @@ private SmileMapper serializeAndDeserialize(SmileMapper mapper) throws Exception
 
         ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(serializedBytes);
         ObjectInputStream inputStream = new ObjectInputStream(byteArrayInputStream);
-        Object deserializedObject = inputStream.readObject();
-        assertTrue(deserializedObject instanceof SmileMapper,
+        return assertInstanceOf(SmileMapper.class, inputStream.readObject(),
                 "Deserialized object should be an instance of ObjectMapper");
-        return (SmileMapper) deserializedObject;
     }
 
     private Object _simpleData() {