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 @@ 4.13 test + + org.junit.jupiter + junit-jupiter-api + test + From e3fa81f8542bee86fc23aa2e2f987d2eb2c7d381 Mon Sep 17 00:00:00 2001 From: John Patrick <142304+nhojpatrick@users.noreply.github.com> Date: Tue, 4 Oct 2022 22:11:57 +0100 Subject: [PATCH 2/2] JUnit assertThrows Digester153TestCase --- .../apache/commons/digester3/Digester153TestCase.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/core/src/test/java/org/apache/commons/digester3/Digester153TestCase.java b/core/src/test/java/org/apache/commons/digester3/Digester153TestCase.java index 8d08a4dc3..05ee04440 100644 --- a/core/src/test/java/org/apache/commons/digester3/Digester153TestCase.java +++ b/core/src/test/java/org/apache/commons/digester3/Digester153TestCase.java @@ -23,6 +23,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 org.apache.commons.digester3.annotations.FromAnnotationsRuleModule; import org.apache.commons.digester3.binder.AbstractRulesModule; @@ -170,17 +171,15 @@ public void basicConstructorWithValuesNotFound() assertEquals( 0D, bean.getDoubleProperty(), 0 ); } - @Test( expected = SAXParseException.class ) - public void basicConstructorWithWrongParameters() - throws Exception - { + @Test + public void basicConstructorWithWrongParameters() { final ObjectCreateRule createRule = new ObjectCreateRule( TestBean.class ); createRule.setConstructorArgumentTypes( boolean.class ); final Digester digester = new Digester(); digester.addRule( "toplevel/bean", createRule ); - digester.parse( getClass().getResourceAsStream( "BasicConstructor.xml" ) ); + assertThrows(SAXParseException.class, () -> digester.parse(getClass().getResourceAsStream("BasicConstructor.xml"))); } @Test