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 c850b106665949f110d0efbcf833ae3788576930 Mon Sep 17 00:00:00 2001
From: John Patrick <142304+nhojpatrick@users.noreply.github.com>
Date: Wed, 19 Oct 2022 19:15:27 +0100
Subject: [PATCH 2/2] JUnit5 assertThrows AbstractProxyFactoryTestCase

---
 .../proxy2/AbstractProxyFactoryTestCase.java  | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/core/src/test/java/org/apache/commons/proxy2/AbstractProxyFactoryTestCase.java b/core/src/test/java/org/apache/commons/proxy2/AbstractProxyFactoryTestCase.java
index 363addf7..1a75d58a 100644
--- a/core/src/test/java/org/apache/commons/proxy2/AbstractProxyFactoryTestCase.java
+++ b/core/src/test/java/org/apache/commons/proxy2/AbstractProxyFactoryTestCase.java
@@ -23,6 +23,7 @@
 import static org.junit.Assert.assertNotSame;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -221,18 +222,18 @@ public void testInterceptingProxySerializable() throws Exception
         assertSerializable(proxy);
     }
 
-    @Test(expected = IOException.class)
-    public void testInterceptorProxyWithCheckedException() throws Exception
+    @Test
+    public void testInterceptorProxyWithCheckedException()
     {
         final Echo proxy = factory.createInterceptorProxy(new EchoImpl(), new NoOpMethodInterceptor(), ECHO_ONLY);
-        proxy.ioException();
+        assertThrows(IOException.class, () -> proxy.ioException());
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testInterceptorProxyWithUncheckedException() throws Exception
+    @Test
+    public void testInterceptorProxyWithUncheckedException()
     {
         final Echo proxy = factory.createInterceptorProxy(new EchoImpl(), new NoOpMethodInterceptor(), ECHO_ONLY);
-        proxy.illegalArgument();
+        assertThrows(IllegalArgumentException.class, () -> proxy.illegalArgument());
     }
 
     @Test
@@ -326,18 +327,18 @@ public void testPrimitiveParameter()
         assertEquals(1, echo.echoBack(1));
     }
 
-    @Test(expected = IOException.class)
-    public void testProxyWithCheckedException() throws Exception
+    @Test
+    public void testProxyWithCheckedException()
     {
         final Echo proxy = factory.createDelegatorProxy(new ConstantProvider<Echo>(new EchoImpl()), Echo.class);
-        proxy.ioException();
+        assertThrows(IOException.class, () -> proxy.ioException());
     }
 
-    @Test(expected = IllegalArgumentException.class)
-    public void testProxyWithUncheckedException() throws Exception
+    @Test
+    public void testProxyWithUncheckedException()
     {
         final Echo proxy = factory.createDelegatorProxy(new ConstantProvider<Echo>(new EchoImpl()), Echo.class);
-        proxy.illegalArgument();
+        assertThrows(IllegalArgumentException.class, () -> proxy.illegalArgument());
     }
 
     @Test