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

---
 .../proxy2/interceptor/ObjectProviderInterceptorTest.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/core/src/test/java/org/apache/commons/proxy2/interceptor/ObjectProviderInterceptorTest.java b/core/src/test/java/org/apache/commons/proxy2/interceptor/ObjectProviderInterceptorTest.java
index c4ef0646..52f67729 100644
--- a/core/src/test/java/org/apache/commons/proxy2/interceptor/ObjectProviderInterceptorTest.java
+++ b/core/src/test/java/org/apache/commons/proxy2/interceptor/ObjectProviderInterceptorTest.java
@@ -19,6 +19,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import org.apache.commons.proxy2.provider.ObjectProviderUtils;
 import org.apache.commons.proxy2.util.AbstractTestCase;
@@ -26,6 +27,7 @@
 
 public class ObjectProviderInterceptorTest extends AbstractTestCase
 {
+
     //----------------------------------------------------------------------------------------------------------------------
     // Other Methods
     //----------------------------------------------------------------------------------------------------------------------
@@ -37,9 +39,10 @@ public void testIntercept() throws Throwable
         assertEquals("Hello!", interceptor.intercept(null));
     }
 
-    @Test(expected = NullPointerException.class)
+    @Test
     public void testWithNullProvider()
     {
-        assertNotNull(new ObjectProviderInterceptor(null)); // assert is used to avoid not used warning
+        assertThrows(NullPointerException.class, () -> new ObjectProviderInterceptor(null));
     }
+
 }