Minor test refactoring

Author: cowtowncoder

src/test/java/com/fasterxml/jackson/databind/BaseTest.java

@@ -310,6 +310,37 @@ protected JsonParser createParserUsingStream(JsonFactory f,
         return f.createParser(is);
     }
 
+    /*
+    /**********************************************************
+    /* JDK ser/deser
+    /**********************************************************
+     */
+
+    protected final static byte[] jdkSerialize(Object o)
+    {
+        ByteArrayOutputStream bytes = new ByteArrayOutputStream(2000);
+        try (ObjectOutputStream obOut = new ObjectOutputStream(bytes)) {
+            obOut.writeObject(o);
+            obOut.close();
+            return bytes.toByteArray();
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    protected final static <T> T jdkDeserialize(byte[] raw)
+    {
+        try (ObjectInputStream objIn = new ObjectInputStream(new ByteArrayInputStream(raw))) {
+            return (T) objIn.readObject();
+        } catch (ClassNotFoundException e) {
+            fail("Missing class: "+e.getMessage());
+            return null;
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+    
     /*
     /**********************************************************
     /* Additional assertion methods

src/test/java/com/fasterxml/jackson/databind/TestJDKSerialization.java

@@ -191,33 +191,4 @@ public void testTypeFactory() throws Exception
         t = orig.constructType(JavaType.class);
         assertEquals(JavaType.class, t.getRawClass());
     }
-
-    /*
-    /**********************************************************
-    /* Helper methods
-    /**********************************************************
-     */
-    
-    public static byte[] jdkSerialize(Object o) throws IOException
-    {
-        ByteArrayOutputStream bytes = new ByteArrayOutputStream(2000);
-        ObjectOutputStream obOut = new ObjectOutputStream(bytes);
-        obOut.writeObject(o);
-        obOut.close();
-        return bytes.toByteArray();
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <T> T jdkDeserialize(byte[] raw) throws IOException
-    {
-        ObjectInputStream objIn = new ObjectInputStream(new ByteArrayInputStream(raw));
-        try {
-            return (T) objIn.readObject();
-        } catch (ClassNotFoundException e) {
-            fail("Missing class: "+e.getMessage());
-            return null;
-        } finally {
-            objIn.close();
-        }
-    }
 }

src/test/java/com/fasterxml/jackson/databind/node/NodeJDKSerializationTest.java

@@ -101,27 +101,4 @@ protected void testNodeRoundtrip(JsonNode input) throws Exception
         JsonNode result = jdkDeserialize(ser);
         assertEquals(input, result);
     }
-
-    protected byte[] jdkSerialize(Object o) throws IOException
-    {
-        ByteArrayOutputStream bytes = new ByteArrayOutputStream(1000);
-        ObjectOutputStream obOut = new ObjectOutputStream(bytes);
-        obOut.writeObject(o);
-        obOut.close();
-        return bytes.toByteArray();
-    }
-
-    @SuppressWarnings("unchecked")
-    protected <T> T jdkDeserialize(byte[] raw) throws IOException
-    {
-        ObjectInputStream objIn = new ObjectInputStream(new ByteArrayInputStream(raw));
-        try {
-            return (T) objIn.readObject();
-        } catch (ClassNotFoundException e) {
-            fail("Missing class: "+e.getMessage());
-            return null;
-        } finally {
-            objIn.close();
-        }
-    }
 }

src/test/java/com/fasterxml/jackson/databind/util/LRUMapTest.java

@@ -2,9 +2,6 @@
 
 import com.fasterxml.jackson.databind.BaseTest;
 
-import static com.fasterxml.jackson.databind.TestJDKSerialization.jdkDeserialize;
-import static com.fasterxml.jackson.databind.TestJDKSerialization.jdkSerialize;
-
 public class LRUMapTest extends BaseTest {
 
     public void testPutGet() {