diff --git a/src/test/java/tools/jackson/core/JDKSerializabilityTest.java b/src/test/java/tools/jackson/core/JDKSerializabilityTest.java index 4261dfba2a..571a1719c4 100644 --- a/src/test/java/tools/jackson/core/JDKSerializabilityTest.java +++ b/src/test/java/tools/jackson/core/JDKSerializabilityTest.java @@ -12,8 +12,6 @@ import tools.jackson.core.util.JsonRecyclerPools; import tools.jackson.core.util.RecyclerPool; -import static com.fasterxml.jackson.core.util.JdkSerializationTestUtils.jdkDeserialize; -import static com.fasterxml.jackson.core.util.JdkSerializationTestUtils.jdkSerialize; import static org.junit.jupiter.api.Assertions.*; /** diff --git a/src/test/java/tools/jackson/core/JUnit5TestBase.java b/src/test/java/tools/jackson/core/JUnit5TestBase.java index c4e23ed158..f7411a3b9e 100644 --- a/src/test/java/tools/jackson/core/JUnit5TestBase.java +++ b/src/test/java/tools/jackson/core/JUnit5TestBase.java @@ -415,6 +415,12 @@ protected int[] calcQuads(byte[] wordBytes) { return result; } + /* + /********************************************************************** + /* Content reading, serialization + /********************************************************************** + */ + public static byte[] readResource(String ref) { ByteArrayOutputStream bytes = new ByteArrayOutputStream(); @@ -437,4 +443,28 @@ public static byte[] readResource(String ref) } return bytes.toByteArray(); } + + public static 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") + public static 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(); + } + } + } diff --git a/src/test/java/tools/jackson/core/util/JdkSerializationTestUtils.java b/src/test/java/tools/jackson/core/util/JdkSerializationTestUtils.java deleted file mode 100644 index 21bcccda7e..0000000000 --- a/src/test/java/tools/jackson/core/util/JdkSerializationTestUtils.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.fasterxml.jackson.core.util; - -import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; - -import static org.junit.jupiter.api.Assertions.fail; - -public class JdkSerializationTestUtils { - public static 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") - public static 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(); - } - } -} diff --git a/src/test/java/tools/jackson/core/util/TestSerializedString.java b/src/test/java/tools/jackson/core/util/TestSerializedString.java index 083f8b0cc0..f9509eb148 100644 --- a/src/test/java/tools/jackson/core/util/TestSerializedString.java +++ b/src/test/java/tools/jackson/core/util/TestSerializedString.java @@ -10,8 +10,6 @@ import tools.jackson.core.io.SerializedString; import static org.junit.jupiter.api.Assertions.assertEquals; -import static tools.jackson.core.util.JdkSerializationTestUtils.jdkDeserialize; -import static tools.jackson.core.util.JdkSerializationTestUtils.jdkSerialize; /** * Simple unit tests to try to verify that the default