From 8fa6859e717402d6e48801305230550846bd5c54 Mon Sep 17 00:00:00 2001 From: John Patrick <142304+nhojpatrick@users.noreply.github.com> Date: Wed, 19 Oct 2022 19:11:15 +0100 Subject: [PATCH 1/2] JUnit v5 api dependency to test --- test/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test/pom.xml b/test/pom.xml index fcc93eab..2711d64d 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -59,6 +59,11 @@ commons-lang3 test + + org.junit.jupiter + junit-jupiter-api + test + From 7a494d2d6162352bd18fceef293266c88efe5d85 Mon Sep 17 00:00:00 2001 From: John Patrick <142304+nhojpatrick@users.noreply.github.com> Date: Wed, 19 Oct 2022 19:18:40 +0100 Subject: [PATCH 2/2] JUnit5 assertThrows SerializationProxyTest --- .../proxy2/serialization/SerializationProxyTest.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/test/src/test/java/org/apache/commons/proxy2/serialization/SerializationProxyTest.java b/test/src/test/java/org/apache/commons/proxy2/serialization/SerializationProxyTest.java index 658144a7..85dcc337 100644 --- a/test/src/test/java/org/apache/commons/proxy2/serialization/SerializationProxyTest.java +++ b/test/src/test/java/org/apache/commons/proxy2/serialization/SerializationProxyTest.java @@ -18,6 +18,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.io.Serializable; @@ -91,14 +92,14 @@ public void clearProxyFactory() PROXY_FACTORY.remove(); } - @Test(expected = SerializationException.class) + @Test public void testNaive() { final Provider proxy = proxyFactory.createInterceptorProxy(null, implementProvider("foo"), Provider.class, Serializable.class); assertEquals("foo", proxy.getObject().getValue()); assertTrue(Serializable.class.isInstance(proxy)); - SerializationUtils.roundtrip((Serializable) proxy); + assertThrows(SerializationException.class, () -> SerializationUtils.roundtrip((Serializable) proxy)); } @Test @@ -110,4 +111,5 @@ public void testSerializationProxy() final Provider proxy2 = (Provider) SerializationUtils.roundtrip((Serializable) proxy); assertEquals("foo", proxy2.getObject().getValue()); } + }