From d7c5d7ae4fd6b8c875eba591333aee601242020c Mon Sep 17 00:00:00 2001
From: John Patrick <142304+nhojpatrick@users.noreply.github.com>
Date: Wed, 19 Oct 2022 19:18:40 +0100
Subject: [PATCH] JUnit5 assertThrows SerializationProxyTest

---
 .../serialization/SerializationProxyTest.java       | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/test/src/test/java/org/apache/commons/proxy2/serialization/SerializationProxyTest.java b/test/src/test/java/org/apache/commons/proxy2/serialization/SerializationProxyTest.java
index 658144a7..486955da 100644
--- a/test/src/test/java/org/apache/commons/proxy2/serialization/SerializationProxyTest.java
+++ b/test/src/test/java/org/apache/commons/proxy2/serialization/SerializationProxyTest.java
@@ -18,6 +18,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.Serializable;
 
@@ -31,6 +32,7 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.jupiter.api.function.Executable;
 
 public class SerializationProxyTest extends AbstractProxyFactoryAgnosticTest
 {
@@ -91,14 +93,21 @@ public void clearProxyFactory()
         PROXY_FACTORY.remove();
     }
 
-    @Test(expected = SerializationException.class)
+    @Test
     public void testNaive()
     {
         final Provider proxy = proxyFactory.createInterceptorProxy(null, implementProvider("foo"), Provider.class,
                 Serializable.class);
         assertEquals("foo", proxy.getObject().getValue());
         assertTrue(Serializable.class.isInstance(proxy));
-        SerializationUtils.roundtrip((Serializable) proxy);
+        // FIXME Simplification once upgraded to Java 1.8
+        final Executable testMethod = new Executable() {
+            @Override
+            public void execute() throws Throwable {
+                SerializationUtils.roundtrip((Serializable) proxy);
+            }
+        };
+        assertThrows(SerializationException.class, testMethod);
     }
 
     @Test