(commons-jexl) 05/07: Use assertThrows()

[ggregory]

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 9f9ead5b6919e7b5ee3cb21775a68e9143a25453
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Jun 1 15:17:52 2024 -0400

    Use assertThrows()
---
 .../org/apache/commons/jexl3/Issues200Test.java    | 25 +++++++++++-----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/test/java/org/apache/commons/jexl3/Issues200Test.java 
b/src/test/java/org/apache/commons/jexl3/Issues200Test.java
index cb0fb59b..09b5778f 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues200Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues200Test.java
@@ -632,6 +632,7 @@ public class Issues200Test extends JexlTestCase {
 
     @Test
     public void test278() throws Exception {
+        // @formatter:off
         final String[] srcs = {
             "return union x143('arg',5,6) ",
             "return union y143('arg',5,6)   ;",
@@ -641,26 +642,24 @@ public class Issues200Test extends JexlTestCase {
         final Object[] ctls = {
             "42","42","42", 42
         };
+        // @formatter:on
         final JexlEngine jexl = new JexlBuilder().cache(4).create();
         final JexlContext ctxt = new MapContext();
-        final int[] foo = {42};
+        final int[] foo = { 42 };
         ctxt.set("foo", foo);
         ctxt.set("union", "42");
         Object value;
         JexlScript jc;
-        for(int i = 0; i < srcs.length; ++i) {
-            String src = srcs[i];
-            try {
-                jc = jexl.createScript(src);
-                fail("should have failed, " + (jc != null));
-            } catch (final JexlException.Ambiguous xa) {
-                final String str = xa.toString();
-                assertTrue(str.contains("143"));
-                src = xa.tryCleanSource(src);
-            }
-            jc = jexl.createScript(src);
+        for (int i = 0; i < srcs.length; ++i) {
+            final String src = srcs[i];
+            final JexlException.Ambiguous xa = 
assertThrows(JexlException.Ambiguous.class, () -> jexl.createScript(src));
+            final String str = xa.toString();
+            assertTrue(str.contains("143"));
+            String clean = xa.tryCleanSource(src);
+
+            jc = jexl.createScript(clean);
             value = jc.execute(ctxt);
-            assertEquals(ctls[i], value, src);
+            assertEquals(ctls[i], value, clean);
         }
     }