From 3d4068d86fe76aaf7fa10e15d7ad97db31428878 Mon Sep 17 00:00:00 2001
From: John Patrick <142304+nhojpatrick@users.noreply.github.com>
Date: Tue, 4 Oct 2022 21:40:58 +0100
Subject: [PATCH 1/2] JUnit Jupiter Api dependency

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

diff --git a/core/pom.xml b/core/pom.xml
index 8e886ddc5..6fc84ac0d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -55,6 +55,11 @@
       <version>4.13</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>

From 47acf9942f5056791713ae51023dd0674e9b885e Mon Sep 17 00:00:00 2001
From: John Patrick <142304+nhojpatrick@users.noreply.github.com>
Date: Tue, 4 Oct 2022 22:13:46 +0100
Subject: [PATCH 2/2] JUnit assertThrows Digester171TestCase

---
 .../digester3/Digester171TestCase.java        | 30 +++++++++----------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/core/src/test/java/org/apache/commons/digester3/Digester171TestCase.java b/core/src/test/java/org/apache/commons/digester3/Digester171TestCase.java
index 286b12a91..c91b7510d 100644
--- a/core/src/test/java/org/apache/commons/digester3/Digester171TestCase.java
+++ b/core/src/test/java/org/apache/commons/digester3/Digester171TestCase.java
@@ -20,6 +20,7 @@
  */
 
 import static org.apache.commons.digester3.binder.DigesterLoader.newLoader;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import java.io.File;
 
@@ -50,26 +51,23 @@ protected void configure()
         .parse( new File( "src/test/resources/org/apache/commons/digester3/document-with-relative-dtd-error.xml" ) );
     }
 
-    @Test( expected = SAXParseException.class )
-    public void testDefaultThrowingErrorHandler()
-        throws Exception
-    {
+    @Test
+    public void testDefaultThrowingErrorHandler() {
         final ErrorHandler customErrorHandler = new DefaultThrowingErrorHandler();
 
-        newLoader( new AbstractRulesModule()
-        {
+        assertThrows(SAXParseException.class, () ->
+                newLoader(new AbstractRulesModule() {
 
-            @Override
-            protected void configure()
-            {
-                // do nothing
-            }
+                    @Override
+                    protected void configure() {
+                        // do nothing
+                    }
 
-        } )
-        .setFeature( "http://xml.org/sax/features/validation", true )
-        .setErrorHandler( customErrorHandler )
-        .newDigester()
-        .parse( new File( "src/test/resources/org/apache/commons/digester3/document-with-relative-dtd-error.xml" ) );
+                })
+                        .setFeature("http://xml.org/sax/features/validation", true)
+                        .setErrorHandler(customErrorHandler)
+                        .newDigester()
+                        .parse(new File("src/test/resources/org/apache/commons/digester3/document-with-relative-dtd-error.xml")));
     }
 
 }