Author: henrib
Date: Fri May 21 11:16:40 2010
New Revision: 946971
URL: http://svn.apache.org/viewvc?rev=946971&view=rev
Log:
JEXL-102: added jexl2 & variants as name/extension/mime for
JexlScriptingEngineFactory
Modified:
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngineFactory.java
commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/scripting/JexlScriptEngineTest.java
Modified:
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngineFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngineFactory.java?rev=946971&r1=946970&r2=946971&view=diff
==============================================================================
---
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngineFactory.java
(original)
+++
commons/proper/jexl/trunk/src/main/java/org/apache/commons/jexl2/scripting/JexlScriptEngineFactory.java
Fri May 21 11:16:40 2010
@@ -48,7 +48,7 @@ public class JexlScriptEngineFactory imp
/** {...@inheritdoc} */
public String getEngineVersion() {
- return "1.0"; // ensure this is updated if function changes are made
to this class
+ return "2.0"; // ensure this is updated if function changes are made
to this class
}
/** {...@inheritdoc} */
@@ -82,17 +82,17 @@ public class JexlScriptEngineFactory imp
/** {...@inheritdoc} */
public List<String> getExtensions() {
- return Collections.unmodifiableList(Arrays.asList("jexl"));
+ return Collections.unmodifiableList(Arrays.asList("jexl", "jexl2"));
}
/** {...@inheritdoc} */
public List<String> getMimeTypes() {
- return
Collections.unmodifiableList(Arrays.asList("application/x-jexl"));
+ return
Collections.unmodifiableList(Arrays.asList("application/x-jexl",
"application/x-jexl2"));
}
/** {...@inheritdoc} */
public List<String> getNames() {
- return Collections.unmodifiableList(Arrays.asList("JEXL", "Jexl",
"jexl"));
+ return Collections.unmodifiableList(Arrays.asList("JEXL", "Jexl",
"jexl", "JEXL2", "Jexl2", "jexl2"));
}
/** {...@inheritdoc} */
Modified:
commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/scripting/JexlScriptEngineTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/scripting/JexlScriptEngineTest.java?rev=946971&r1=946970&r2=946971&view=diff
==============================================================================
---
commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/scripting/JexlScriptEngineTest.java
(original)
+++
commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/scripting/JexlScriptEngineTest.java
Fri May 21 11:16:40 2010
@@ -20,6 +20,7 @@ package org.apache.commons.jexl2.scripti
import java.io.Reader;
import java.util.Arrays;
+import java.util.List;
import java.util.Map;
import javax.script.ScriptEngine;
@@ -27,30 +28,46 @@ import javax.script.ScriptEngineManager;
import junit.framework.TestCase;
public class JexlScriptEngineTest extends TestCase {
+ private static final List<String> NAMES = Arrays.asList("JEXL", "Jexl",
"jexl", "JEXL2", "Jexl2", "jexl2");
+ private static final List<String> EXTENSIONS = Arrays.asList("jexl",
"jexl2");
+ private static final List<String> MIMES =
Arrays.asList("application/x-jexl", "application/x-jexl2");
public void testScriptEngineFactory() throws Exception {
JexlScriptEngineFactory factory = new JexlScriptEngineFactory();
assertEquals("JEXL Engine", factory.getParameter(ScriptEngine.ENGINE));
- assertEquals("1.0", factory.getParameter(ScriptEngine.ENGINE_VERSION));
+ assertEquals("2.0", factory.getParameter(ScriptEngine.ENGINE_VERSION));
assertEquals("JEXL", factory.getParameter(ScriptEngine.LANGUAGE));
assertEquals("2.0",
factory.getParameter(ScriptEngine.LANGUAGE_VERSION));
- assertEquals(Arrays.asList("JEXL", "Jexl", "jexl"),
factory.getParameter(ScriptEngine.NAME));
assertNull(factory.getParameter("THREADING"));
-
- assertEquals(Arrays.asList("jexl"), factory.getExtensions());
- assertEquals(Arrays.asList("application/x-jexl"),
factory.getMimeTypes());
+ assertEquals(NAMES, factory.getParameter(ScriptEngine.NAME));
+ assertEquals(EXTENSIONS, factory.getExtensions());
+ assertEquals(MIMES, factory.getMimeTypes());
assertEquals("42;", factory.getProgram(new String[]{"42"}));
assertEquals("str.substring(3,4)", factory.getMethodCallSyntax("str",
"substring", new String[]{"3", "4"}));
}
+ public void testScriptingGetBy() throws Exception {
+ ScriptEngineManager manager = new ScriptEngineManager();
+ assertNotNull("Manager should not be null", manager);
+ for (String name : NAMES) {
+ ScriptEngine engine = manager.getEngineByName(name);
+ assertNotNull("Engine should not be null (name)", engine);
+ }
+ for (String extension : EXTENSIONS) {
+ ScriptEngine engine = manager.getEngineByExtension(extension);
+ assertNotNull("Engine should not be null (extension)", engine);
+ }
+ for (String mime : MIMES) {
+ ScriptEngine engine = manager.getEngineByMimeType(mime);
+ assertNotNull("Engine should not be null (mime)", engine);
+ }
+ }
+
public void testScripting() throws Exception {
ScriptEngineManager manager = new ScriptEngineManager();
assertNotNull("Manager should not be null", manager);
- ScriptEngine engine = manager.getEngineByName("jexl");
- assertNotNull("Engine should not be null (name)", engine);
- engine = manager.getEngineByExtension("jexl");
- assertNotNull("Engine should not be null (ext)", engine);
+ ScriptEngine engine = manager.getEngineByName("jexl2");
final Integer initialValue = Integer.valueOf(123);
assertEquals(initialValue,engine.eval("123"));
assertEquals(initialValue,engine.eval("0;123"));// multiple statements
@@ -77,7 +94,7 @@ public class JexlScriptEngineTest extend
public void testNulls() throws Exception {
ScriptEngineManager manager = new ScriptEngineManager();
assertNotNull("Manager should not be null", manager);
- ScriptEngine engine = manager.getEngineByName("jexl");
+ ScriptEngine engine = manager.getEngineByName("jexl2");
assertNotNull("Engine should not be null (name)", engine);
try {
engine.eval((String)null);
@@ -93,17 +110,6 @@ public class JexlScriptEngineTest extend
}
}
- public void testEngineNames() throws Exception {
- ScriptEngineManager manager = new ScriptEngineManager();
- assertNotNull("Manager should not be null", manager);
- ScriptEngine engine = manager.getEngineByName("JEXL");
- assertNotNull("Engine should not be null (JEXL)", engine);
- engine = manager.getEngineByName("Jexl");
- assertNotNull("Engine should not be null (Jexl)", engine);
- engine = manager.getEngineByName("jexl");
- assertNotNull("Engine should not be null (jexl)", engine);
- }
-
public void testScopes() throws Exception {
ScriptEngineManager manager = new ScriptEngineManager();
assertNotNull("Manager should not be null", manager);
