From 20212a87d9eb37239e69ef7ee58a2c75461e8963 Mon Sep 17 00:00:00 2001
From: John Patrick <142304+nhojpatrick@users.noreply.github.com>
Date: Wed, 19 Oct 2022 19:10:42 +0100
Subject: [PATCH 1/2] JUnit v5 api dependency to core

---
 core/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/pom.xml b/core/pom.xml
index 9ab9db15..5f7196f4 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -40,6 +40,11 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

From b0d4df1ae6df0598250043607e67270ef786ea6b Mon Sep 17 00:00:00 2001
From: John Patrick <142304+nhojpatrick@users.noreply.github.com>
Date: Wed, 19 Oct 2022 19:16:10 +0100
Subject: [PATCH 2/2] JUnit5 assertThrows
 AbstractSubclassingProxyFactoryTestCase

---
 ...stractSubclassingProxyFactoryTestCase.java | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/core/src/test/java/org/apache/commons/proxy2/AbstractSubclassingProxyFactoryTestCase.java b/core/src/test/java/org/apache/commons/proxy2/AbstractSubclassingProxyFactoryTestCase.java
index 8cd7ff1a..8a0330da 100644
--- a/core/src/test/java/org/apache/commons/proxy2/AbstractSubclassingProxyFactoryTestCase.java
+++ b/core/src/test/java/org/apache/commons/proxy2/AbstractSubclassingProxyFactoryTestCase.java
@@ -20,6 +20,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.util.Date;
 
@@ -72,11 +73,12 @@ public void testDelegatorEquals() throws Exception
         assertFalse(proxy2.equals(proxy1));
     }
 
-    @Test(expected = ProxyFactoryException.class)
+    @Test
     public void testDelegatorWithMultipleSuperclasses()
     {
-        factory.createDelegatorProxy(new ConstantProvider<EchoImpl>(new EchoImpl()), new Class[] { EchoImpl.class,
-                String.class });
+        assertThrows(ProxyFactoryException.class, () ->
+                factory.createDelegatorProxy(new ConstantProvider<EchoImpl>(new EchoImpl()), new Class[]{EchoImpl.class,
+                        String.class}));
     }
 
     @Test
@@ -101,11 +103,12 @@ public void testInterceptorEquals()
         assertFalse(proxy2.equals(proxy1));
     }
 
-    @Test(expected = ProxyFactoryException.class)
+    @Test
     public void testInterceptorWithMultipleSuperclasses()
     {
-        factory.createInterceptorProxy(new EchoImpl(), new NoOpMethodInterceptor(), new Class[] { EchoImpl.class,
-                String.class });
+        assertThrows(ProxyFactoryException.class, () ->
+                factory.createInterceptorProxy(new EchoImpl(), new NoOpMethodInterceptor(), new Class[]{EchoImpl.class,
+                        String.class}));
     }
 
     @Test
@@ -116,10 +119,11 @@ public void testInterceptorWithSuperclass()
         assertTrue(echo instanceof EchoImpl);
     }
 
-    @Test(expected = ProxyFactoryException.class)
+    @Test
     public void testInvocationHandlerWithMultipleSuperclasses()
     {
-        factory.createInvokerProxy(new NullInvoker(), new Class[] { EchoImpl.class, String.class });
+        assertThrows(ProxyFactoryException.class, () ->
+                factory.createInvokerProxy(new NullInvoker(), new Class[]{EchoImpl.class, String.class}));
     }
 
     @Override