JUnit assertThrows Digester153TestCase

Author: nhojpatrick

core/src/test/java/org/apache/commons/digester3/Digester153TestCase.java

@@ -23,12 +23,14 @@
 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;
 import org.apache.commons.digester3.binder.RulesModule;
 import org.apache.commons.digester3.xmlrules.FromXmlRulesModule;
 import org.junit.Test;
+import org.junit.jupiter.api.function.Executable;
 import org.xml.sax.SAXParseException;
 
 /**
@@ -170,17 +172,22 @@ 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" ) );
+        // FIXME Simplification once upgraded to Java 1.8 and use lambda
+        final Executable testMethod = new Executable() {
+            @Override
+            public void execute() throws Throwable {
+                digester.parse(getClass().getResourceAsStream("BasicConstructor.xml"));
+            }
+        };
+        assertThrows(SAXParseException.class, testMethod);
     }
 
     @Test