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 2026/04/05 13:39:44 UTC
(commons-jexl) branch master updated: Use static imports only for JUnit
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
The following commit(s) were added to refs/heads/master by this push:
new d3b6ab5f Use static imports only for JUnit
d3b6ab5f is described below
commit d3b6ab5f312e5c98ad8bc76fc22fa68af1a2b038
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sun Apr 5 09:39:38 2026 -0400
Use static imports only for JUnit
---
.../org/apache/commons/jexl3/Issues400Test.java | 65 +++++++++++-----------
.../java/org/apache/commons/jexl3/LambdaTest.java | 5 +-
.../java/org/apache/commons/jexl3/SwitchTest.java | 41 +++++++-------
.../internal/introspection/PermissionsTest.java | 34 +++++------
.../jexl3/scripting/JexlScriptEngineTest.java | 7 +--
5 files changed, 74 insertions(+), 78 deletions(-)
diff --git a/src/test/java/org/apache/commons/jexl3/Issues400Test.java b/src/test/java/org/apache/commons/jexl3/Issues400Test.java
index 280fd6d6..3782db53 100644
--- a/src/test/java/org/apache/commons/jexl3/Issues400Test.java
+++ b/src/test/java/org/apache/commons/jexl3/Issues400Test.java
@@ -53,7 +53,6 @@ import org.apache.commons.jexl3.parser.ASTJexlScript;
import org.apache.commons.jexl3.parser.JexlScriptParser;
import org.apache.commons.jexl3.parser.Parser;
import org.apache.commons.jexl3.parser.StringProvider;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
/**
@@ -752,7 +751,7 @@ public class Issues400Test {
final String[] j = {"a!=b", "a == 2", "a.b.c != '1<>0'"};
for (int i = 0; i < e.length; ++i) {
final String je = transcodeSQLExpr(e[i]);
- Assertions.assertEquals(j[i], je);
+ assertEquals(j[i], je);
}
}
@@ -761,7 +760,7 @@ public class Issues400Test {
final String[] e = {"a <= 2", "a >= 2", "a := 2", "a + 3 << 4 > 5",};
for (final String element : e) {
final String je = transcodeSQLExpr(element);
- Assertions.assertEquals(element, je);
+ assertEquals(element, je);
}
}
@@ -775,12 +774,12 @@ public class Issues400Test {
.sideEffectGlobal(false);
final JexlBuilder builder = new JexlBuilder().parserFactory(SQLParser::new).cache(32).features(f);
final JexlEngine sqle = builder.create();
- Assertions.assertTrue((boolean) sqle.createScript("a <> 25", "a").execute(null, 24));
- Assertions.assertFalse((boolean) sqle.createScript("a <> 25", "a").execute(null, 25));
- Assertions.assertFalse((boolean) sqle.createScript("a = 25", "a").execute(null, 24));
- Assertions.assertTrue((boolean) sqle.createScript("a != 25", "a").execute(null, 24));
- Assertions.assertTrue((boolean) sqle.createScript("a = 25", "a").execute(null, 25));
- Assertions.assertFalse((boolean) sqle.createScript("a != 25", "a").execute(null, 25));
+ assertTrue((boolean) sqle.createScript("a <> 25", "a").execute(null, 24));
+ assertFalse((boolean) sqle.createScript("a <> 25", "a").execute(null, 25));
+ assertFalse((boolean) sqle.createScript("a = 25", "a").execute(null, 24));
+ assertTrue((boolean) sqle.createScript("a != 25", "a").execute(null, 24));
+ assertTrue((boolean) sqle.createScript("a = 25", "a").execute(null, 25));
+ assertFalse((boolean) sqle.createScript("a != 25", "a").execute(null, 25));
}
@Test
@@ -789,7 +788,7 @@ public class Issues400Test {
String ctl = "\nab\nc`d\n";
final JexlExpression e = jexl.createExpression("`\nab\nc\\`d\n`");
Object o = e.evaluate(null);
- Assertions.assertEquals(ctl, o);
+ assertEquals(ctl, o);
final JexlContext context = new MapContext();
context.set("name", "Hello");
@@ -797,7 +796,7 @@ public class Issues400Test {
final JexlScript script = jexl.createScript(code);
o = script.execute(context);
ctl = "Hello\nHello";
- Assertions.assertEquals(ctl, o);
+ assertEquals(ctl, o);
}
@Test
@@ -809,7 +808,7 @@ public class Issues400Test {
"`${x} ${z}`;\n" + "}\n" + "test('world');";
final JexlScript script = jexl.createScript(code);
final Object result = script.execute(context);
- Assertions.assertEquals("hello world", result);
+ assertEquals("hello world", result);
}
@@ -821,17 +820,17 @@ public class Issues400Test {
+ "c+foo(a, b)";
final JexlScript script = jexl.createScript(src, "a", "b");
final Object result = script.execute(null, "a", "b");
- Assertions.assertEquals("a\n?= ba\n?== b", result);
+ assertEquals("a\n?= ba\n?== b", result);
String[] locals = script.getLocalVariables();
- Assertions.assertArrayEquals(new String[]{"c", "foo"}, locals);
+ assertArrayEquals(new String[]{"c", "foo"}, locals);
final String TEST447 = "src/test/scripts/test447.jexl";
final File src447 = new File(TEST447);
final JexlScript script447 = jexl.createScript(src447);
final Object result447 = script447.execute(null);
- Assertions.assertInstanceOf(List.class, result447);
+ assertInstanceOf(List.class, result447);
@SuppressWarnings("unchecked") final List<Boolean> list = (List<Boolean>) result447;
for (final Boolean item : list) {
- Assertions.assertTrue(item);
+ assertTrue(item);
}
}
@@ -990,7 +989,7 @@ public class Issues400Test {
JexlScript script = jexl.createScript(code);
Object o = script.execute(null, "Hello");
String ctl = "HelloHello";
- Assertions.assertEquals(ctl, o);
+ assertEquals(ctl, o);
}
@Test
@@ -1000,7 +999,7 @@ public class Issues400Test {
JexlScript script = jexl.createScript(code);
Object o = script.execute(null, "Hello");
String ctl = "Hello\nHello";
- Assertions.assertEquals(ctl, o);
+ assertEquals(ctl, o);
}
@Test
@@ -1023,7 +1022,7 @@ public class Issues400Test {
JexlScript script = jexl.createScript(code, "ref", "greeting");
Object o = script.execute(null, "greeting", "Hello");
String ctl = "Hello\nHello";
- Assertions.assertEquals(ctl, o);
+ assertEquals(ctl, o);
}
@Test
@@ -1033,7 +1032,7 @@ public class Issues400Test {
final String src = "(name, suffix) -> `#{name} Hello ${name} ! #{suffix}`";
final JexlScript script = jexl.createScript(src);
final Object result = script.execute(null, "World", "~");
- Assertions.assertEquals("World Hello World ! ~", result);
+ assertEquals("World Hello World ! ~", result);
}
@Test
@@ -1043,7 +1042,7 @@ public class Issues400Test {
final String src = "(name, suffix) -> `#{name + ' Hello'} ${name + ' !'} #{suffix}`";
final JexlScript script = jexl.createScript(src);
final Object result = script.execute(null, "World", "~");
- Assertions.assertEquals("World Hello World ! ~", result);
+ assertEquals("World Hello World ! ~", result);
}
@Test
@@ -1054,7 +1053,7 @@ public class Issues400Test {
final StringWriter writer = new StringWriter();
// prepare requires immediate arguments; evaluate needs deferred arguments
template.prepare(null, "World", null).evaluate(null, writer, null, "~");
- Assertions.assertEquals("World ~", writer.toString());
+ assertEquals("World ~", writer.toString());
}
@Test
@@ -1065,13 +1064,13 @@ public class Issues400Test {
final StringWriter writer = new StringWriter();
// Prepare only the immediate name argument; evaluate needs both deferred arguments - name and suffix
template.prepare(null, "World").evaluate(null, writer, "World", "~");
- Assertions.assertEquals("World Hello World ! ~", writer.toString());
+ assertEquals("World Hello World ! ~", writer.toString());
}
@Test
void testIssue456a() {
final JexlFeatures features = JexlFeatures.createDefault();
- Assertions.assertThrows(JexlException.Parsing.class, () -> run456(
+ assertThrows(JexlException.Parsing.class, () -> run456(
f -> new JexlBuilder().features(f).strict(true).create(),
features, null));
}
@@ -1080,7 +1079,7 @@ public class Issues400Test {
@Test
void testIssue456b() {
final JexlFeatures features = JexlFeatures.createDefault().ignoreTemplatePrefix(true);
- Assertions.assertNotNull(run456(
+ assertNotNull(run456(
f -> new JexlBuilder().features(f).strict(true).create(),
features, null));
}
@@ -1088,7 +1087,7 @@ public class Issues400Test {
@Test
void testIssue456c() {
final JexlFeatures features = JexlFeatures.createDefault().ignoreTemplatePrefix(true);
- Assertions.assertNotNull(run456(
+ assertNotNull(run456(
f -> new JexlBuilder().features(f).strict(false).create(),
features, null));
}
@@ -1099,7 +1098,7 @@ public class Issues400Test {
JexlContext ctxt = new MapContext();
ctxt.set("$$", "");
final JexlFeatures features = JexlFeatures.createDefault().ignoreTemplatePrefix(true);
- Assertions.assertNotNull(run456(
+ assertNotNull(run456(
f -> new JexlBuilder().features(f).strict(true).create(),
features, ctxt));
}
@@ -1111,7 +1110,7 @@ public class Issues400Test {
final JxltEngine.Template template = jxlt.createTemplate("$$ var foo = 'foo';$$ var bar = 'bar';\n${foo + bar}");
final StringWriter writer = new StringWriter();
template.evaluate(ctxt, writer);
- Assertions.assertEquals("foobar", writer.toString());
+ assertEquals("foobar", writer.toString());
return jxlt;
}
@@ -1123,10 +1122,10 @@ public class Issues400Test {
jexl.createScript("var foo = 0;\nfoo = 42;");
try {
jxlt.createTemplate("$$ var foo = 'foo'; if (true) { var foo = 'bar'; var err =&; }");
- Assertions.fail("should have thrown a parsing error in '&'");
+ fail("should have thrown a parsing error in '&'");
} catch (JexlException xjexl) {
// parsing error in '&'
- Assertions.assertTrue(xjexl.getMessage().contains("&"));
+ assertTrue(xjexl.getMessage().contains("&"));
}
// JEXL-456: java.lang.NullPointerException:
// Cannot invoke "org.apache.commons.jexl3.internal.Scope.getCaptureDeclaration(int)" because "blockScope" is null
@@ -1144,10 +1143,10 @@ public class Issues400Test {
final JxltEngine jxlt = jexl.createJxltEngine();
try {
jxlt.createTemplate("$$ var err =&;");
- Assertions.fail("should have thrown a parsing error in '&'");
+ fail("should have thrown a parsing error in '&'");
} catch (JexlException xjexl) {
// parsing error in '&'
- Assertions.assertTrue(xjexl.getMessage().contains("&"));
+ assertTrue(xjexl.getMessage().contains("&"));
}
// JEXL-456: parsing error in 'foo: variable is already declared'
jexl.createScript("let foo = 0;\nfoo = 42;");
@@ -1155,7 +1154,7 @@ public class Issues400Test {
final JxltEngine.Template template = jxlt.createTemplate("$$ var foo = 0;\n$$ $$ foo = 42;\n${foo}");
final StringWriter writer = new StringWriter();
template.evaluate(null, writer);
- Assertions.assertEquals("42", writer.toString());
+ assertEquals("42", writer.toString());
}
}
diff --git a/src/test/java/org/apache/commons/jexl3/LambdaTest.java b/src/test/java/org/apache/commons/jexl3/LambdaTest.java
index e733a59c..7c6d0c3c 100644
--- a/src/test/java/org/apache/commons/jexl3/LambdaTest.java
+++ b/src/test/java/org/apache/commons/jexl3/LambdaTest.java
@@ -30,7 +30,6 @@ import java.util.concurrent.Callable;
import org.apache.commons.jexl3.internal.Closure;
import org.apache.commons.jexl3.internal.Script;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.CsvSource;
@@ -591,7 +590,7 @@ class LambdaTest extends JexlTestCase {
final JexlScript script = jexl.createScript(src);
assertNotNull(script);
final Object result = script.execute(null);
- Assertions.assertEquals(-169, result);
+ assertEquals(-169, result);
}
@Test void testRefCapture6() {
@@ -604,6 +603,6 @@ class LambdaTest extends JexlTestCase {
assertInstanceOf(JexlScript.class, result);
script = jexl.createScript("f()", "f");
result = script.execute(null, result);
- Assertions.assertEquals(-167, result);
+ assertEquals(-167, result);
}
}
diff --git a/src/test/java/org/apache/commons/jexl3/SwitchTest.java b/src/test/java/org/apache/commons/jexl3/SwitchTest.java
index 7d2eb332..890e5f8c 100644
--- a/src/test/java/org/apache/commons/jexl3/SwitchTest.java
+++ b/src/test/java/org/apache/commons/jexl3/SwitchTest.java
@@ -26,7 +26,6 @@ import java.util.Arrays;
import java.util.List;
import org.apache.commons.jexl3.internal.Debugger;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
/**
@@ -86,15 +85,15 @@ public class SwitchTest extends JexlTestCase {
assertNotNull(dbgStr);
Object result = script.execute(null, 10);
- Assertions.assertEquals(3, result);
+ assertEquals(3, result);
result = script.execute(null, 11);
- Assertions.assertEquals(3, result);
+ assertEquals(3, result);
result = script.execute(null, 20);
- Assertions.assertEquals(4, result);
+ assertEquals(4, result);
result = script.execute(null, 21);
- Assertions.assertEquals(4, result);
+ assertEquals(4, result);
result = script.execute(null, 38);
- Assertions.assertEquals(42, result);
+ assertEquals(42, result);
src = "let y = switch (x) { case 10,11 -> break; case 20, 21 -> 4; } y";
try {
script = jexl.createScript(src, "x");
@@ -122,15 +121,15 @@ public class SwitchTest extends JexlTestCase {
assertNotNull(dbgStr);
Object result = script.execute(null, 10);
- Assertions.assertEquals(3, result);
+ assertEquals(3, result);
result = script.execute(null, 20);
- Assertions.assertEquals(4, result);
+ assertEquals(4, result);
result = script.execute(null, 21);
- Assertions.assertEquals(4, result);
+ assertEquals(4, result);
result = script.execute(null, 32);
- Assertions.assertEquals(169, result);
+ assertEquals(169, result);
result = script.execute(null, 38);
- Assertions.assertEquals(42, result);
+ assertEquals(42, result);
}
public enum Scope440 {
@@ -140,7 +139,7 @@ public class SwitchTest extends JexlTestCase {
@Test
void test440p() {
- Assertions.assertTrue(RESTRICTED.allow(this.getClass()));
+ assertTrue(RESTRICTED.allow(this.getClass()));
}
@Test
@@ -154,11 +153,11 @@ public class SwitchTest extends JexlTestCase {
assertNotNull(dbgStr);
Object result = script.execute(null, Scope440.UNDEFINED);
- Assertions.assertEquals("undefined", result);
+ assertEquals("undefined", result);
result = script.execute(null, Scope440.THIS);
- Assertions.assertEquals("this", result);
+ assertEquals("this", result);
result = script.execute(null, 21);
- Assertions.assertEquals("OTHER", result);
+ assertEquals("OTHER", result);
}
@Test
@@ -180,7 +179,7 @@ public class SwitchTest extends JexlTestCase {
final String src = "function f(x) { switch (x) { case Scope440.UNDEFINED : return 'undefined'; } } f(x)";
final JexlScript script = jexl.createScript(src, "x");
final Object result = script.execute(null, Scope440.UNDEFINED);
- Assertions.assertEquals("undefined", result);
+ assertEquals("undefined", result);
try {
script.execute(null, Scope440.THIS);
fail("should not be able to execute script with switch expression with no default");
@@ -222,15 +221,15 @@ public class SwitchTest extends JexlTestCase {
final JexlScript script = jexl.createScript(src, "x");
Object result;
result = script.execute(null, 1);
- Assertions.assertEquals("one", result);
+ assertEquals("one", result);
result = script.execute(null, 2);
- Assertions.assertEquals("two", result);
+ assertEquals("two", result);
result = script.execute(null, 3);
- Assertions.assertEquals("three", result);
+ assertEquals("three", result);
result = script.execute(null, 4);
- Assertions.assertEquals("many", result);
+ assertEquals("many", result);
result = script.execute(null, 42);
- Assertions.assertEquals("many", result);
+ assertEquals("many", result);
final Debugger debugger = new Debugger();
assertTrue(debugger.debug(script));
final String dbgStr = debugger.toString();
diff --git a/src/test/java/org/apache/commons/jexl3/internal/introspection/PermissionsTest.java b/src/test/java/org/apache/commons/jexl3/internal/introspection/PermissionsTest.java
index 2b60e9f6..56344345 100644
--- a/src/test/java/org/apache/commons/jexl3/internal/introspection/PermissionsTest.java
+++ b/src/test/java/org/apache/commons/jexl3/internal/introspection/PermissionsTest.java
@@ -23,6 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
import java.io.FileWriter;
import java.lang.reflect.Constructor;
@@ -48,7 +49,6 @@ import org.apache.commons.jexl3.internal.introspection.nojexlpackage.Invisible;
import org.apache.commons.jexl3.introspection.JexlPermissions;
import org.apache.commons.jexl3.introspection.JexlUberspect;
import org.example.Pair;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
/**
@@ -513,17 +513,17 @@ class PermissionsTest {
final JexlEngine jexl = new JexlBuilder().cache(8).permissions(permissions).namespaces(funcs).create();
String src = "let p = lisp:cons(17, 25); p.car + p.cdr;";
JexlScript script = jexl.createScript(src);
- Assertions.assertEquals(42, script.execute(null));
- Assertions.assertEquals(42, script.execute(null));
+ assertEquals(42, script.execute(null));
+ assertEquals(42, script.execute(null));
src = "(p, x, y) -> { p.car = x; p.cdr = y; }";
Pair p = new Pair(-1, -41);
script = jexl.createScript(src);
- Assertions.assertNotNull(script.execute(null, p, 22, 20));
- Assertions.assertEquals(22, p.car);
- Assertions.assertEquals(20, p.cdr);
- Assertions.assertNotNull(script.execute(null, p, 18, 24));
- Assertions.assertEquals(18, p.car);
- Assertions.assertEquals(24, p.cdr);
+ assertNotNull(script.execute(null, p, 22, 20));
+ assertEquals(22, p.car);
+ assertEquals(20, p.cdr);
+ assertNotNull(script.execute(null, p, 18, 24));
+ assertEquals(18, p.car);
+ assertEquals(24, p.cdr);
}
@Test
@@ -533,18 +533,18 @@ class PermissionsTest {
final JexlEngine jexl = new JexlBuilder().cache(8).permissions(permissions).namespaces(funcs).create();
final String src = "import org.example.Pair; new Pair(17, 25);";
final JexlScript script = jexl.createScript(src);
- Assertions.assertThrows(JexlException.class, ()-> script.execute(null));
+ assertThrows(JexlException.class, ()-> script.execute(null));
}
@Test
void testPermissions457a() {
- Assertions.assertTrue(RESTRICTED.allow(Long.TYPE));
+ assertTrue(RESTRICTED.allow(Long.TYPE));
for (Constructor<?> ctor : FileWriter.class.getDeclaredConstructors()) {
- Assertions.assertFalse(RESTRICTED.allow(ctor));
+ assertFalse(RESTRICTED.allow(ctor));
}
for (Method m : FileWriter.class.getMethods()) {
if (m.getName().equals("write")) {
- Assertions.assertTrue(RESTRICTED.allow(m), m.toString());
+ assertTrue(RESTRICTED.allow(m), m.toString());
}
}
}
@@ -563,9 +563,9 @@ class PermissionsTest {
final JexlScript script = jexl.createScript(src);
try {
script.execute(null);
- Assertions.fail("should have thrown a permission exception");
+ fail("should have thrown a permission exception");
} catch (JexlException.Method exception) {
- Assertions.assertTrue(exception.getMethod().contains("File"), "FileWriter::new should not be allowed");
+ assertTrue(exception.getMethod().contains("File"), "FileWriter::new should not be allowed");
}
}
}
@@ -581,9 +581,9 @@ class PermissionsTest {
final JexlScript script = jexl.createScript(src);
try {
script.execute(null);
- Assertions.fail("should have thrown a permission exception");
+ fail("should have thrown a permission exception");
} catch (JexlException.Method exception) {
- Assertions.assertTrue(exception.getMethod().contains("File"), "FileReader::new should not be allowed");
+ assertTrue(exception.getMethod().contains("File"), "FileReader::new should not be allowed");
}
}
}
diff --git a/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java b/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java
index 3f4966cb..14401f06 100644
--- a/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java
+++ b/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java
@@ -49,7 +49,6 @@ import org.apache.commons.jexl3.JexlBuilder;
import org.apache.commons.jexl3.JexlException;
import org.apache.commons.jexl3.introspection.JexlPermissions;
import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
class JexlScriptEngineTest {
@@ -278,7 +277,7 @@ class JexlScriptEngineTest {
"> >> 22" + LF +
"> >> 42" + LF +
"> ";
- Assertions.assertEquals(ctl, strw.toString());
+ assertEquals(ctl, strw.toString());
}
@Test
@@ -287,7 +286,7 @@ class JexlScriptEngineTest {
final StringReader strr = new StringReader("args[0]+args[1]");
Main.run(new BufferedReader(strr), new PrintWriter(strw), new Object[]{20, 22});
final String ctl = ">>: 42" + LF;
- Assertions.assertEquals(ctl, strw.toString());
+ assertEquals(ctl, strw.toString());
}
@Test
@@ -303,7 +302,7 @@ class JexlScriptEngineTest {
writer.close();
final String ctl = ">>: 42" + LF;
Main.main(new String[]{file.toString()});
- Assertions.assertEquals(ctl, outContent.toString());
+ assertEquals(ctl, outContent.toString());
} finally {
System.setOut(originalOut);
if (file != null) {