From a3591442bd73ed966b1eff8b419a88cd5bf648c4 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Fri, 26 Apr 2024 19:17:49 -0700
Subject: [PATCH] Test clean up

---
 .../jackson/core/JDKSerializabilityTest.java  |  4 +--
 .../jackson/core/JUnit5TestBase.java          | 30 ++++++++++++++++
 .../core/util/JdkSerializationTestUtils.java  | 34 -------------------
 .../core/util/TestSerializedString.java       |  4 +--
 4 files changed, 32 insertions(+), 40 deletions(-)
 delete mode 100644 src/test/java/com/fasterxml/jackson/core/util/JdkSerializationTestUtils.java

diff --git a/src/test/java/com/fasterxml/jackson/core/JDKSerializabilityTest.java b/src/test/java/com/fasterxml/jackson/core/JDKSerializabilityTest.java
index 2710170cc0..b93b49140b 100644
--- a/src/test/java/com/fasterxml/jackson/core/JDKSerializabilityTest.java
+++ b/src/test/java/com/fasterxml/jackson/core/JDKSerializabilityTest.java
@@ -9,15 +9,13 @@
 import com.fasterxml.jackson.core.util.DefaultPrettyPrinter;
 import com.fasterxml.jackson.core.util.JsonRecyclerPools;
 
-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.*;
 
 /**
  * Unit tests for [core#31] (https://github.com/FasterXML/jackson-core/issues/31)
  */
 class JDKSerializabilityTest
-        extends JUnit5TestBase
+    extends JUnit5TestBase
 {
     /*
     /**********************************************************************
diff --git a/src/test/java/com/fasterxml/jackson/core/JUnit5TestBase.java b/src/test/java/com/fasterxml/jackson/core/JUnit5TestBase.java
index 0a71c7d41e..788136d42b 100644
--- a/src/test/java/com/fasterxml/jackson/core/JUnit5TestBase.java
+++ b/src/test/java/com/fasterxml/jackson/core/JUnit5TestBase.java
@@ -419,6 +419,12 @@ protected int[] calcQuads(byte[] wordBytes) {
         return result;
     }
 
+    /*
+    /**********************************************************************
+    /* Content reading, serialization
+    /**********************************************************************
+     */
+
     public static byte[] readResource(String ref)
     {
        ByteArrayOutputStream bytes = new ByteArrayOutputStream();
@@ -441,4 +447,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> 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/com/fasterxml/jackson/core/util/JdkSerializationTestUtils.java b/src/test/java/com/fasterxml/jackson/core/util/JdkSerializationTestUtils.java
deleted file mode 100644
index 21bcccda7e..0000000000
--- a/src/test/java/com/fasterxml/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> 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/com/fasterxml/jackson/core/util/TestSerializedString.java b/src/test/java/com/fasterxml/jackson/core/util/TestSerializedString.java
index 8be473112c..b03017b602 100644
--- a/src/test/java/com/fasterxml/jackson/core/util/TestSerializedString.java
+++ b/src/test/java/com/fasterxml/jackson/core/util/TestSerializedString.java
@@ -9,8 +9,6 @@
 import org.junit.jupiter.api.Test;
 import com.fasterxml.jackson.core.io.SerializedString;
 
-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.assertEquals;
 
 /**
@@ -18,7 +16,7 @@
  * {@link SerializableString} implementation works as expected.
  */
 class TestSerializedString
-        extends com.fasterxml.jackson.core.JUnit5TestBase
+    extends com.fasterxml.jackson.core.JUnit5TestBase
 {
     private static final String QUOTED = "\\\"quo\\\\ted\\\"";