You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2024/06/01 20:04:28 UTC

(commons-jexl) 01/09: Use assertThrows()

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 525c8b02ea113e14908af13187a12225f5e87f0d
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jun 1 15:45:01 2024 -0400

    Use assertThrows()
---
 .../java/org/apache/commons/jexl3/Issues300Test.java    | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/test/java/org/apache/commons/jexl3/Issues300Test.java b/src/test/java/org/apache/commons/jexl3/Issues300Test.java
index 812a52db..2baed53c 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues300Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues300Test.java
@@ -846,13 +846,8 @@ public class Issues300Test {
         final String src = "var i = ++1";
         final JexlEngine jexl = new JexlBuilder().safe(true).create();
         final JexlInfo info = new JexlInfo("badscript", 0, 0);
-        try {
-            final JexlScript script = jexl.createScript(info, src);
-            fail("should not parse");
-        } catch (final JexlException.Parsing xparse) {
-            final String msg = xparse.getMessage();
-            assertTrue(msg.contains("badscript"));
-        }
+        final JexlException.Parsing xparse = assertThrows(JexlException.Parsing.class, () -> jexl.createScript(info, src), "should not parse");
+        assertTrue(xparse.getMessage().contains("badscript"));
     }
 
     @Test
@@ -865,13 +860,7 @@ public class Issues300Test {
         myObject.setName("John");
         final JexlContext context = new ObjectContext<>(engine, myObject);
         // Expect an exception because nested is null, so we are doing null.name
-        try {
-            final Object result = expr.evaluate(context);
-            fail("An exception expected, but got: " + result);
-        } catch (final JexlException ex) {
-            // Expected
-            //ex.printStackTrace();
-        }
+        assertThrows(JexlException.class, () -> expr.evaluate(context));
     }
 
     @Test