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 3d4cb92 Use varargs.
3d4cb92 is described below
commit 3d4cb92cfef99b340ab2d59d9fb2d0059c58dbe1
Author: Gary Gregory <[email protected]>
AuthorDate: Sun Feb 28 17:53:31 2021 -0500
Use varargs.
---
src/test/java/org/apache/commons/jexl3/ForEachTest.java | 4 ++--
src/test/java/org/apache/commons/jexl3/JXLTTest.java | 14 +++++---------
src/test/java/org/apache/commons/jexl3/ScriptTest.java | 4 ++--
.../commons/jexl3/scripting/JexlScriptEngineTest.java | 4 ++--
4 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/src/test/java/org/apache/commons/jexl3/ForEachTest.java
b/src/test/java/org/apache/commons/jexl3/ForEachTest.java
index 317b5cf..48308f0 100644
--- a/src/test/java/org/apache/commons/jexl3/ForEachTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ForEachTest.java
@@ -69,7 +69,7 @@ public class ForEachTest extends JexlTestCase {
public void testForEachWithCollection() throws Exception {
final JexlScript e = JEXL.createScript("for(var item : list) item");
final JexlContext jc = new MapContext();
- jc.set("list", Arrays.asList(new Object[]{"Hello", "World"}));
+ jc.set("list", Arrays.asList("Hello", "World"));
final Object o = e.execute(jc);
Assert.assertEquals("Result is not last evaluated expression",
"World", o);
}
@@ -87,7 +87,7 @@ public class ForEachTest extends JexlTestCase {
public void testForEachWithIterator() throws Exception {
final JexlScript e = JEXL.createScript("for(var item : list) item");
final JexlContext jc = new MapContext();
- jc.set("list", Arrays.asList(new Object[]{"Hello",
"World"}).iterator());
+ jc.set("list", Arrays.asList("Hello", "World").iterator());
final Object o = e.execute(jc);
Assert.assertEquals("Result is not last evaluated expression",
"World", o);
}
diff --git a/src/test/java/org/apache/commons/jexl3/JXLTTest.java
b/src/test/java/org/apache/commons/jexl3/JXLTTest.java
index 2598bc3..a4f1bd1 100644
--- a/src/test/java/org/apache/commons/jexl3/JXLTTest.java
+++ b/src/test/java/org/apache/commons/jexl3/JXLTTest.java
@@ -62,15 +62,11 @@ public class JXLTTest extends JexlTestCase {
public static List<JexlBuilder> engines() {
final JexlFeatures f = new JexlFeatures();
f.lexical(true).lexicalShade(true);
- return Arrays.<JexlBuilder>asList(new JexlBuilder[] {
- new JexlBuilder().silent(false)
- .lexical(true).lexicalShade(true)
- .cache(128).strict(true),
- new JexlBuilder().features(f).silent(false)
- .cache(128).strict(true),
- new JexlBuilder().silent(false)
- .cache(128).strict(true),
- });
+ return Arrays.<JexlBuilder>asList(new JexlBuilder().silent(false)
+ .lexical(true).lexicalShade(true)
+ .cache(128).strict(true), new JexlBuilder().features(f).silent(false)
+ .cache(128).strict(true), new JexlBuilder().silent(false)
+ .cache(128).strict(true));
}
@Before
diff --git a/src/test/java/org/apache/commons/jexl3/ScriptTest.java
b/src/test/java/org/apache/commons/jexl3/ScriptTest.java
index a501e3b..6c7ed1b 100644
--- a/src/test/java/org/apache/commons/jexl3/ScriptTest.java
+++ b/src/test/java/org/apache/commons/jexl3/ScriptTest.java
@@ -90,7 +90,7 @@ public class ScriptTest extends JexlTestCase {
@Test
public void testArgScriptFromFile() throws Exception {
final File testScript = new File(TEST_ADD);
- final JexlScript s = JEXL.createScript(testScript,new
String[]{"x","y"});
+ final JexlScript s = JEXL.createScript(testScript,"x", "y");
final JexlContext jc = new MapContext();
jc.set("out", System.out);
final Object result = s.execute(jc, 13, 29);
@@ -112,7 +112,7 @@ public class ScriptTest extends JexlTestCase {
@Test
public void testArgScriptFromURL() throws Exception {
final URL testUrl = new File(TEST_ADD).toURI().toURL();
- final JexlScript s = JEXL.createScript(testUrl,new String[]{"x","y"});
+ final JexlScript s = JEXL.createScript(testUrl,"x", "y");
final JexlContext jc = new MapContext();
jc.set("out", System.out);
final Object result = s.execute(jc, 13, 29);
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 ebd8e1e..51f0e13 100644
--- a/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java
+++ b/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java
@@ -49,8 +49,8 @@ public class JexlScriptEngineTest {
Assert.assertEquals(EXTENSIONS, factory.getExtensions());
Assert.assertEquals(MIMES, factory.getMimeTypes());
- Assert.assertEquals("42;", factory.getProgram(new String[]{"42"}));
- Assert.assertEquals("str.substring(3,4)",
factory.getMethodCallSyntax("str", "substring", new String[]{"3", "4"}));
+ Assert.assertEquals("42;", factory.getProgram("42"));
+ Assert.assertEquals("str.substring(3,4)",
factory.getMethodCallSyntax("str", "substring", "3", "4"));
}
@Test