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

---
 .../commons/proxy2/provider/BeanProviderTest.java  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/core/src/test/java/org/apache/commons/proxy2/provider/BeanProviderTest.java b/core/src/test/java/org/apache/commons/proxy2/provider/BeanProviderTest.java
index 7a1d864b..59035dab 100644
--- a/core/src/test/java/org/apache/commons/proxy2/provider/BeanProviderTest.java
+++ b/core/src/test/java/org/apache/commons/proxy2/provider/BeanProviderTest.java
@@ -21,23 +21,25 @@
 import org.apache.commons.proxy2.util.AbstractTestCase;
 import org.junit.Test;
 
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 public class BeanProviderTest extends AbstractTestCase
 {
     //**********************************************************************************************************************
     // Other Methods
     //**********************************************************************************************************************
 
-    @Test(expected = ObjectProviderException.class)
+    @Test
     public void testAbstractBeanClass()
     {
         final BeanProvider<Number> p = new BeanProvider<Number>(Number.class);
-        p.getObject();
+        assertThrows(ObjectProviderException.class, () -> p.getObject());
     }
 
-    @Test(expected = ObjectProviderException.class)
+    @Test
     public void testNonAccessibleConstructor()
     {
-        new BeanProvider<MyBean>(MyBean.class).getObject();
+        assertThrows(ObjectProviderException.class, () -> new BeanProvider<MyBean>(MyBean.class).getObject());
     }
 
     @Test
@@ -46,11 +48,11 @@ public void testSerialization()
         assertSerializable(new BeanProvider<MyBean>(MyBean.class));
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testWithNullBeanClass()
     {
         final BeanProvider<Object> p = new BeanProvider<Object>(null);
-        p.getObject();
+        assertThrows(NullPointerException.class, () -> p.getObject());
     }
 
     //**********************************************************************************************************************