This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-jexl.git
commit 65756d7c323479a3c77a5a91637ee9f6dfc8de33 Author: Gary Gregory <[email protected]> AuthorDate: Sat Jun 1 15:13:22 2024 -0400 Use assertThrows() --- .../org/apache/commons/jexl3/Issues200Test.java | 24 ++++++---------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/src/test/java/org/apache/commons/jexl3/Issues200Test.java b/src/test/java/org/apache/commons/jexl3/Issues200Test.java index b1fe9fc4..2d640afe 100644 --- a/src/test/java/org/apache/commons/jexl3/Issues200Test.java +++ b/src/test/java/org/apache/commons/jexl3/Issues200Test.java @@ -576,27 +576,15 @@ public class Issues200Test extends JexlTestCase { public void test274() throws Exception { JexlEngine jexl = new JexlBuilder().strict(true).safe(true).stackOverflow(5).create(); final JexlContext ctxt = new MapContext(); - JexlScript script= jexl.createScript("var f = (x)->{ x > 1? x * f(x - 1) : x }; f(a)", "a"); + final JexlScript script = jexl.createScript("var f = (x)->{ x > 1? x * f(x - 1) : x }; f(a)", "a"); Object result = script.execute(ctxt, 3); assertEquals(6, result); - try { - result = script.execute(ctxt, 32); - fail("should have overflown"); - } catch (final JexlException.StackOverflow xstack) { - // expected - final String sxs = xstack.toString(); - assertTrue(sxs.contains("jexl")); - } + JexlException.StackOverflow xstack = assertThrows(JexlException.StackOverflow.class, () -> script.execute(ctxt, 32)); + assertTrue(xstack.toString().contains("jexl")); jexl = new JexlBuilder().strict(true).create(); - script= jexl.createScript("var f = (x)->{ x * f(x - 1) }; f(a)", "a"); - try { - result = script.execute(ctxt, 32); - fail("should have overflown"); - } catch (final JexlException.StackOverflow xstack) { - // expected - final String sxs = xstack.toString(); - assertTrue(sxs.contains("jvm")); - } + final JexlScript script2 = jexl.createScript("var f = (x)->{ x * f(x - 1) }; f(a)", "a"); + xstack = assertThrows(JexlException.StackOverflow.class, () -> script2.execute(ctxt, 32)); + assertTrue(xstack.toString().contains("jvm")); } @Test
