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 4ede2d6cb45b42b6eba50524f2a90bd12f800a59
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sat Jun 1 19:00:04 2024 -0400
Let JUnit handle exception
---
.../java/org/apache/commons/jexl3/MethodTest.java | 106 ++++++++++-----------
1 file changed, 51 insertions(+), 55 deletions(-)
diff --git a/src/test/java/org/apache/commons/jexl3/MethodTest.java
b/src/test/java/org/apache/commons/jexl3/MethodTest.java
index 1167905c..1cdde0cd 100644
--- a/src/test/java/org/apache/commons/jexl3/MethodTest.java
+++ b/src/test/java/org/apache/commons/jexl3/MethodTest.java
@@ -484,61 +484,57 @@ public class MethodTest extends JexlTestCase {
Object c;
JexlExpression e;
final JexlEvalContext jc = new EnhancedContext(funcs);
- try {
- for (int i = 0; i < 2; ++i) {
- e = JEXL.createExpression("func:exec([1, 2])");
- o = e.evaluate(jc);
- assertEquals(20, o, "exec(int[] arg): " + i);
-
- e = JEXL.createExpression("func:exec(1, 2)");
- o = e.evaluate(jc);
- assertEquals(4, o, "exec(Object... args): " + i);
-
- e = JEXL.createExpression("func:exec([10.0, 20.0])");
- o = e.evaluate(jc);
- assertEquals(3, o, "exec(Object args): " + i);
-
- e = JEXL.createExpression("func:exec('1', 2)");
- o = e.evaluate(jc);
- assertEquals(4, o, "exec(Object... args): " + i);
-
- // no way to differentiate between a single arg call with an
array and a vararg call with same args
- assertEquals(func.exec("1", "2"), func.exec(new String[]{"1",
"2"}), "exec(String... args): " + i);
- e = JEXL.createExpression("func:exec(['1', '2'])");
- o = e.evaluate(jc);
- assertEquals(func.exec(new String[]{"1", "2"}), o,
"exec(String... args): " + i);
- e = JEXL.createExpression("func:exec('1', '2')");
- o = e.evaluate(jc);
- assertEquals(func.exec("1", "2"), o, "exec(String... args): "
+ i);
-
- e = JEXL.createExpression("func:exec(true, [1, 2])");
- o = e.evaluate(jc);
- assertEquals(20, o, "exec(int[] arg): " + i);
-
- e = JEXL.createExpression("func:exec(true, 1, 2)");
- o = e.evaluate(jc);
- assertEquals(4, o, "exec(Object... args): " + i);
-
- e = JEXL.createExpression("func:exec(true, ['1', '2'])");
- o = e.evaluate(jc);
- assertEquals(3, o, "exec(Object args): " + i);
-
- e = JEXL.createExpression("func:exec(true, '1', '2')");
- o = e.evaluate(jc);
- assertEquals(4, o, "exec(Object... args): " + i);
-
- e = JEXL.createExpression("func:execute(true, '1', '2')");
- o = e.evaluate(jc);
- c = func.execute(Boolean.TRUE, "1", "2");
- assertTrue(eqExecute(o, c), "execute(Object... args): " + i);
-
- e = JEXL.createExpression("func:execute([true])");
- o = e.evaluate(jc);
- c = func.execute(new boolean[]{true});
- assertTrue(eqExecute(o, c), "execute(Object... args): " + i);
- }
- } catch (final JexlException xjexl) {
- fail(xjexl.toString());
+ for (int i = 0; i < 2; ++i) {
+ e = JEXL.createExpression("func:exec([1, 2])");
+ o = e.evaluate(jc);
+ assertEquals(20, o, "exec(int[] arg): " + i);
+
+ e = JEXL.createExpression("func:exec(1, 2)");
+ o = e.evaluate(jc);
+ assertEquals(4, o, "exec(Object... args): " + i);
+
+ e = JEXL.createExpression("func:exec([10.0, 20.0])");
+ o = e.evaluate(jc);
+ assertEquals(3, o, "exec(Object args): " + i);
+
+ e = JEXL.createExpression("func:exec('1', 2)");
+ o = e.evaluate(jc);
+ assertEquals(4, o, "exec(Object... args): " + i);
+
+ // no way to differentiate between a single arg call with an array
and a vararg call with same args
+ assertEquals(func.exec("1", "2"), func.exec(new String[] { "1",
"2" }), "exec(String... args): " + i);
+ e = JEXL.createExpression("func:exec(['1', '2'])");
+ o = e.evaluate(jc);
+ assertEquals(func.exec(new String[] { "1", "2" }), o,
"exec(String... args): " + i);
+ e = JEXL.createExpression("func:exec('1', '2')");
+ o = e.evaluate(jc);
+ assertEquals(func.exec("1", "2"), o, "exec(String... args): " + i);
+
+ e = JEXL.createExpression("func:exec(true, [1, 2])");
+ o = e.evaluate(jc);
+ assertEquals(20, o, "exec(int[] arg): " + i);
+
+ e = JEXL.createExpression("func:exec(true, 1, 2)");
+ o = e.evaluate(jc);
+ assertEquals(4, o, "exec(Object... args): " + i);
+
+ e = JEXL.createExpression("func:exec(true, ['1', '2'])");
+ o = e.evaluate(jc);
+ assertEquals(3, o, "exec(Object args): " + i);
+
+ e = JEXL.createExpression("func:exec(true, '1', '2')");
+ o = e.evaluate(jc);
+ assertEquals(4, o, "exec(Object... args): " + i);
+
+ e = JEXL.createExpression("func:execute(true, '1', '2')");
+ o = e.evaluate(jc);
+ c = func.execute(Boolean.TRUE, "1", "2");
+ assertTrue(eqExecute(o, c), "execute(Object... args): " + i);
+
+ e = JEXL.createExpression("func:execute([true])");
+ o = e.evaluate(jc);
+ c = func.execute(new boolean[] { true });
+ assertTrue(eqExecute(o, c), "execute(Object... args): " + i);
}
}
