svn commit: r1753342 - in /velocity/engine/trunk/velocity-engine-scripting/src: main/java/org/apache/velocity/script/VelocityScriptEngine.java test/java/org/apache/velocity/script/test/ScriptEngineTest.java

[cbrisson]

Author: cbrisson
Date: Tue Jul 19 07:21:32 2016
New Revision: 1753342

URL: http://svn.apache.org/viewvc?rev=1753342&view=rev
Log:
[jsr223] context key should be 'context', not 'script_context' ; added test case

Modified:
    
velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java
    
velocity/engine/trunk/velocity-engine-scripting/src/test/java/org/apache/velocity/script/test/ScriptEngineTest.java

Modified: 
velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java?rev=1753342&r1=1753341&r2=1753342&view=diff
==============================================================================
--- 
velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java
 (original)
+++ 
velocity/engine/trunk/velocity-engine-scripting/src/main/java/org/apache/velocity/script/VelocityScriptEngine.java
 Tue Jul 19 07:21:32 2016
@@ -228,7 +228,7 @@ public class VelocityScriptEngine extend
 
     protected static VelocityContext getVelocityContext(ScriptContext ctx)
     {
-        ctx.setAttribute("script_context", ctx, ScriptContext.ENGINE_SCOPE);
+        ctx.setAttribute("context", ctx, ScriptContext.ENGINE_SCOPE);
         Bindings globalScope = ctx.getBindings(ScriptContext.GLOBAL_SCOPE);    
    
         Bindings engineScope = ctx.getBindings(ScriptContext.ENGINE_SCOPE);
         if (globalScope != null)

Modified: 
velocity/engine/trunk/velocity-engine-scripting/src/test/java/org/apache/velocity/script/test/ScriptEngineTest.java
URL: 
http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-scripting/src/test/java/org/apache/velocity/script/test/ScriptEngineTest.java?rev=1753342&r1=1753341&r2=1753342&view=diff
==============================================================================
--- 
velocity/engine/trunk/velocity-engine-scripting/src/test/java/org/apache/velocity/script/test/ScriptEngineTest.java
 (original)
+++ 
velocity/engine/trunk/velocity-engine-scripting/src/test/java/org/apache/velocity/script/test/ScriptEngineTest.java
 Tue Jul 19 07:21:32 2016
@@ -44,8 +44,6 @@ public class ScriptEngineTest extends Ab
 
         String val = engine.get("name1").toString();
         assertEquals("Engine#get should have same effect as context.get ", 
engineScope.get("name1"), val);
-
-
     }
 
 
@@ -86,4 +84,15 @@ public class ScriptEngineTest extends Ab
         Object result = compiled.eval();
         assertEquals(result.toString(), "bar");
     }
+
+    public void testContext() throws ScriptException
+    {
+        String path = System.getProperty("test.resources.dir");
+        engine.getContext().setWriter(new StringWriter());
+        
engine.getContext().setAttribute(VelocityScriptEngine.VELOCITY_PROPERTIES_KEY, 
path + "/test-classes/velocity.properties", ScriptContext.ENGINE_SCOPE);
+        String script = "$context.class.name $context.writer.class.name 
$context.reader.class.name $context.errorWriter.class.name";
+        String result = engine.eval(script).toString();
+        assertEquals("javax.script.SimpleScriptContext java.io.StringWriter 
java.io.InputStreamReader java.io.PrintWriter", result);
+    }
+    
 }