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 @@
junit
test
+
+ org.junit.jupiter
+ junit-jupiter-api
+ test
+
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 p = new BeanProvider(Number.class);
- p.getObject();
+ assertThrows(ObjectProviderException.class, () -> p.getObject());
}
- @Test(expected = ObjectProviderException.class)
+ @Test
public void testNonAccessibleConstructor()
{
- new BeanProvider(MyBean.class).getObject();
+ assertThrows(ObjectProviderException.class, () -> new BeanProvider(MyBean.class).getObject());
}
@Test
@@ -46,11 +48,11 @@ public void testSerialization()
assertSerializable(new BeanProvider(MyBean.class));
}
- @Test(expected = NullPointerException.class)
+ @Test
public void testWithNullBeanClass()
{
final BeanProvider