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 3306da4d3957ef04b711e6dc9830db68e8b4419f Author: Gary Gregory <[email protected]> AuthorDate: Sat Jun 1 15:39:33 2024 -0400 Use assertThrows() --- .../java/org/apache/commons/jexl3/Issues300Test.java | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/src/test/java/org/apache/commons/jexl3/Issues300Test.java b/src/test/java/org/apache/commons/jexl3/Issues300Test.java index ebb1b692..0766ef75 100644 --- a/src/test/java/org/apache/commons/jexl3/Issues300Test.java +++ b/src/test/java/org/apache/commons/jexl3/Issues300Test.java @@ -731,32 +731,22 @@ public class Issues300Test { public void test347() { final String src = "A.B == 5"; JexlEngine jexl = new JexlBuilder().safe(true).create(); - JexlScript script = jexl.createScript(src); + final JexlScript script = jexl.createScript(src); Object result = script.execute(null); // safe navigation is lenient wrt null assertFalse((Boolean) result); jexl = new JexlBuilder().strict(true).safe(false).create(); final JexlContext ctxt = new MapContext(); - script = jexl.createScript(src); + final JexlScript script1 = jexl.createScript(src); // A and A.B undefined - try { - result = script.execute(ctxt); - fail("should only succeed with safe navigation"); - } catch (final JexlException xany) { - assertNotNull(xany); - } + assertThrows(JexlException.class, () -> script1.execute(ctxt)); // A is null, A.B is undefined ctxt.set("A", null); - try { - result = script.execute(ctxt); - fail("should only succeed with safe navigation"); - } catch (final JexlException xany) { - assertNotNull(xany); - } + assertThrows(JexlException.class, () -> script1.execute(ctxt), "should only succeed with safe navigation"); // A.B is null ctxt.set("A.B", null); - result = script.execute(ctxt); + result = script1.execute(ctxt); assertFalse((Boolean) result); }
