refactor: AbstractSerializationTests

Author: Realtin

log4j-api-test/src/main/java/org/apache/logging/log4j/test/AbstractSerializationTest.java

@@ -17,32 +17,25 @@
 package org.apache.logging.log4j.test;
 
 import static org.apache.logging.log4j.test.SerializableMatchers.serializesRoundTrip;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.io.Serializable;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.api.Test;
 
 /**
  * Subclasses tests {@link Serializable} objects.
  */
-@RunWith(Parameterized.class)
 public abstract class AbstractSerializationTest {
 
-    private final Serializable serializable;
-
-    public AbstractSerializationTest(final Serializable serializable) {
-        this.serializable = serializable;
-    }
+    public AbstractSerializationTest() {}
 
     @Test
-    public void testSerializationRoundtripEquals() {
+    public void testSerializationRoundtripEquals(Serializable serializable) {
         assertThat(serializable, serializesRoundTrip(serializable));
     }
 
     @Test
-    public void testSerializationRoundtripNoException() {
+    public void testSerializationRoundtripNoException(Serializable serializable) {
         assertThat(serializable, serializesRoundTrip());
     }
 }

log4j-api-test/src/test/java/org/apache/logging/log4j/message/MessageFormatMessageSerializationTest.java

@@ -18,16 +18,17 @@
 
 import java.util.Arrays;
 import java.util.Collection;
+import java.io.Serializable;
 import org.apache.logging.log4j.test.AbstractSerializationTest;
 import org.junit.jupiter.api.parallel.ResourceAccessMode;
 import org.junit.jupiter.api.parallel.ResourceLock;
 import org.junit.jupiter.api.parallel.Resources;
-import org.junit.runners.Parameterized;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 @ResourceLock(value = Resources.LOCALE, mode = ResourceAccessMode.READ)
 public class MessageFormatMessageSerializationTest extends AbstractSerializationTest {
 
-    @Parameterized.Parameters
     public static Collection<Object[]> data() {
         return Arrays.asList(new Object[][] {
             {new MessageFormatMessage("Test")},
@@ -36,7 +37,19 @@ public static Collection<Object[]> data() {
         });
     }
 
-    public MessageFormatMessageSerializationTest(final MessageFormatMessage message) {
-        super(message);
+    public MessageFormatMessageSerializationTest() {
+        super();
+    }
+
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testSerializationRoundtripEquals(Serializable serializable) {
+        super.testSerializationRoundtripEquals(serializable);
+    }
+
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testSerializationRoundtripNoException(Serializable serializable) {
+        super.testSerializationRoundtripNoException(serializable);
     }
 }

log4j-core-test/src/test/java/org/apache/logging/log4j/core/LoggerSerializationTest.java

@@ -21,11 +21,11 @@
 import java.util.Collection;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.test.AbstractSerializationTest;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 
 public class LoggerSerializationTest extends AbstractSerializationTest {
 
-    @Parameters
     public static Collection<Object[]> data() {
         return Arrays.asList(new Object[][] {
             {new LoggerContext("").getLogger("", null)},
@@ -35,7 +35,19 @@ public static Collection<Object[]> data() {
         });
     }
 
-    public LoggerSerializationTest(final Serializable serializable) {
-        super(serializable);
+    public LoggerSerializationTest() {
+        super();
+    }
+
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testSerializationRoundtripEquals(Serializable serializable) {
+        super.testSerializationRoundtripEquals(serializable);
+    }
+
+    @ParameterizedTest
+    @MethodSource("data")
+    public void testSerializationRoundtripNoException(Serializable serializable) {
+        super.testSerializationRoundtripNoException(serializable);
     }
 }