Copied: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/MethodTest.java (from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MethodTest.java) URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/MethodTest.java?p2=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/MethodTest.java&p1=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MethodTest.java&r1=1206774&r2=1207941&rev=1207941&view=diff ============================================================================== --- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MethodTest.java (original) +++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/MethodTest.java Tue Nov 29 16:18:59 2011 @@ -14,12 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.jexl2; +package org.apache.commons.jexl3; import java.util.HashMap; import java.util.Map; -import org.apache.commons.jexl2.introspection.JexlMethod; -import org.apache.commons.jexl2.junit.Asserter; +import org.apache.commons.jexl3.introspection.JexlMethod; +import org.apache.commons.jexl3.junit.Asserter; +import org.apache.commons.jexl3.junit.Asserter; /** * Tests for calling methods on objects
Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/MethodTest.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ParseFailuresTest.java (from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ParseFailuresTest.java) URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ParseFailuresTest.java?p2=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ParseFailuresTest.java&p1=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ParseFailuresTest.java&r1=1206774&r2=1207941&rev=1207941&view=diff ============================================================================== --- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ParseFailuresTest.java (original) +++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ParseFailuresTest.java Tue Nov 29 16:18:59 2011 @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.jexl2; +package org.apache.commons.jexl3; /** * Tests for malformed expressions and scripts. - * ({@link org.apache.commons.jexl2.JexlEngine#createExpression(String)} and - * {@link org.apache.commons.jexl2.JexlEngine#createScript(String)} should throw - * {@link org.apache.commons.jexl2.JexlException}s). + * ({@link org.apache.commons.jexl3.JexlEngine#createExpression(String)} and + * {@link org.apache.commons.jexl3.JexlEngine#createScript(String)} should throw + * {@link org.apache.commons.jexl3.JexlException}s). * * @since 1.1 */ Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ParseFailuresTest.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/PublicFieldsTest.java (from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/PublicFieldsTest.java) URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/PublicFieldsTest.java?p2=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/PublicFieldsTest.java&p1=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/PublicFieldsTest.java&r1=1206774&r2=1207941&rev=1207941&view=diff ============================================================================== --- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/PublicFieldsTest.java (original) +++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/PublicFieldsTest.java Tue Nov 29 16:18:59 2011 @@ -14,7 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.jexl2; +package org.apache.commons.jexl3; + +import org.apache.commons.jexl3.Expression; +import org.apache.commons.jexl3.JexlContext; +import org.apache.commons.jexl3.JexlException; +import org.apache.commons.jexl3.MapContext; /** * Tests public field set/get. Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/PublicFieldsTest.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/SandboxTest.java (from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/SandboxTest.java) URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/SandboxTest.java?p2=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/SandboxTest.java&p1=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/SandboxTest.java&r1=1206774&r2=1207941&rev=1207941&view=diff ============================================================================== --- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/SandboxTest.java (original) +++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/SandboxTest.java Tue Nov 29 16:18:59 2011 @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.jexl2; +package org.apache.commons.jexl3; import java.util.logging.Logger; -import org.apache.commons.jexl2.introspection.Sandbox; -import org.apache.commons.jexl2.introspection.SandboxUberspectImpl; -import org.apache.commons.jexl2.introspection.Uberspect; +import org.apache.commons.jexl3.introspection.Sandbox; +import org.apache.commons.jexl3.internal.introspection.SandboxUberspect; +import org.apache.commons.jexl3.introspection.Uberspect; /** * Tests sandbox features. @@ -58,7 +58,7 @@ public class SandboxTest extends JexlTes Sandbox sandbox = new Sandbox(); sandbox.black(Foo.class.getName()).execute(""); - Uberspect uber = new SandboxUberspectImpl(null, sandbox); + Uberspect uber = new SandboxUberspect(null, sandbox); JexlEngine sjexl = new JexlEngine(uber, null, null, null); sjexl.setStrict(true); @@ -82,7 +82,7 @@ public class SandboxTest extends JexlTes Sandbox sandbox = new Sandbox(); sandbox.black(Foo.class.getName()).execute("Quux"); - Uberspect uber = new SandboxUberspectImpl(null, sandbox); + Uberspect uber = new SandboxUberspect(null, sandbox); JexlEngine sjexl = new JexlEngine(uber, null, null, null); sjexl.setStrict(true); @@ -106,7 +106,7 @@ public class SandboxTest extends JexlTes Sandbox sandbox = new Sandbox(); sandbox.black(Foo.class.getName()).read("alias"); - Uberspect uber = new SandboxUberspectImpl(null, sandbox); + Uberspect uber = new SandboxUberspect(null, sandbox); JexlEngine sjexl = new JexlEngine(uber, null, null, null); sjexl.setStrict(true); @@ -130,7 +130,7 @@ public class SandboxTest extends JexlTes Sandbox sandbox = new Sandbox(); sandbox.black(Foo.class.getName()).write("alias"); - Uberspect uber = new SandboxUberspectImpl(null, sandbox); + Uberspect uber = new SandboxUberspect(null, sandbox); JexlEngine sjexl = new JexlEngine(uber, null, null, null); sjexl.setStrict(true); @@ -151,7 +151,7 @@ public class SandboxTest extends JexlTes Sandbox sandbox = new Sandbox(); sandbox.white(Foo.class.getName()).execute(""); - Uberspect uber = new SandboxUberspectImpl(null, sandbox); + Uberspect uber = new SandboxUberspect(null, sandbox); JexlEngine sjexl = new JexlEngine(uber, null, null, null); sjexl.setStrict(true); @@ -168,7 +168,7 @@ public class SandboxTest extends JexlTes Sandbox sandbox = new Sandbox(); sandbox.white(Foo.class.getName()).execute("Quux"); - Uberspect uber = new SandboxUberspectImpl(null, sandbox); + Uberspect uber = new SandboxUberspect(null, sandbox); JexlEngine sjexl = new JexlEngine(uber, null, null, null); sjexl.setStrict(true); @@ -186,7 +186,7 @@ public class SandboxTest extends JexlTes Sandbox sandbox = new Sandbox(); sandbox.white(Foo.class.getName()).read("alias"); sandbox.get(Foo.class.getName()).read().alias("alias", "ALIAS"); - Uberspect uber = new SandboxUberspectImpl(null, sandbox); + Uberspect uber = new SandboxUberspect(null, sandbox); JexlEngine sjexl = new JexlEngine(uber, null, null, null); sjexl.setStrict(true); @@ -207,7 +207,7 @@ public class SandboxTest extends JexlTes Sandbox sandbox = new Sandbox(); sandbox.white(Foo.class.getName()).write("alias"); - Uberspect uber = new SandboxUberspectImpl(null, sandbox); + Uberspect uber = new SandboxUberspect(null, sandbox); JexlEngine sjexl = new JexlEngine(uber, null, null, null); sjexl.setStrict(true); @@ -226,7 +226,7 @@ public class SandboxTest extends JexlTes // can not create a new file sandbox.black(java.io.File.class.getName()).execute(""); - Uberspect uber = new SandboxUberspectImpl(null, sandbox); + Uberspect uber = new SandboxUberspect(null, sandbox); JexlEngine sjexl = new JexlEngine(uber, null, null, null); sjexl.setStrict(true); Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/SandboxTest.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java (from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ScriptCallableTest.java) URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java?p2=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java&p1=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ScriptCallableTest.java&r1=1206774&r2=1207941&rev=1207941&view=diff ============================================================================== --- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ScriptCallableTest.java (original) +++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java Tue Nov 29 16:18:59 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.jexl2; +package org.apache.commons.jexl3; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; @@ -31,7 +31,7 @@ public class ScriptCallableTest extends //Logger LOGGER = Logger.getLogger(VarTest.class.getName()); public void testFuture() throws Exception { - Script e = JEXL.createScript("while(true);"); + JexlScript e = JEXL.createScript("while(true);"); FutureTask<Object> future = new FutureTask<Object>(e.callable(null)); ExecutorService executor = Executors.newFixedThreadPool(1); @@ -49,7 +49,7 @@ public class ScriptCallableTest extends } public void testCallable() throws Exception { - Script e = JEXL.createScript("while(true);"); + JexlScript e = JEXL.createScript("while(true);"); Callable<Object> c = e.callable(null); ExecutorService executor = Executors.newFixedThreadPool(1); @@ -96,7 +96,7 @@ public class ScriptCallableTest extends } public void testNoWait() throws Exception { - Script e = JEXL.createScript("wait(0)"); + JexlScript e = JEXL.createScript("wait(0)"); Callable<Object> c = e.callable(new TestContext()); ExecutorService executor = Executors.newFixedThreadPool(1); @@ -107,7 +107,7 @@ public class ScriptCallableTest extends } public void testWait() throws Exception { - Script e = JEXL.createScript("wait(1)"); + JexlScript e = JEXL.createScript("wait(1)"); Callable<Object> c = e.callable(new TestContext()); ExecutorService executor = Executors.newFixedThreadPool(1); @@ -117,7 +117,7 @@ public class ScriptCallableTest extends } public void testCancelWait() throws Exception { - Script e = JEXL.createScript("wait(10)"); + JexlScript e = JEXL.createScript("wait(10)"); Callable<Object> c = e.callable(new TestContext()); ExecutorService executor = Executors.newFixedThreadPool(1); @@ -133,7 +133,7 @@ public class ScriptCallableTest extends } public void testCancelWaitInterrupt() throws Exception { - Script e = JEXL.createScript("waitInterrupt(42)"); + JexlScript e = JEXL.createScript("waitInterrupt(42)"); Callable<Object> c = e.callable(new TestContext()); ExecutorService executor = Executors.newFixedThreadPool(1); @@ -149,7 +149,7 @@ public class ScriptCallableTest extends } public void testCancelForever() throws Exception { - Script e = JEXL.createScript("runForever()"); + JexlScript e = JEXL.createScript("runForever()"); Callable<Object> c = e.callable(new TestContext()); ExecutorService executor = Executors.newFixedThreadPool(1); @@ -165,7 +165,7 @@ public class ScriptCallableTest extends } public void testCancelLoopWait() throws Exception { - Script e = JEXL.createScript("while (true) { wait(10) }"); + JexlScript e = JEXL.createScript("while (true) { wait(10) }"); Callable<Object> c = e.callable(new TestContext()); ExecutorService executor = Executors.newFixedThreadPool(1); Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ScriptCallableTest.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ScriptTest.java (from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ScriptTest.java) URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ScriptTest.java?p2=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ScriptTest.java&p1=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ScriptTest.java&r1=1206774&r2=1207941&rev=1207941&view=diff ============================================================================== --- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/ScriptTest.java (original) +++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ScriptTest.java Tue Nov 29 16:18:59 2011 @@ -14,7 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.jexl2; +package org.apache.commons.jexl3; + +import org.apache.commons.jexl3.Expression; +import org.apache.commons.jexl3.JexlContext; +import org.apache.commons.jexl3.MapContext; +import org.apache.commons.jexl3.Script; import java.io.File; import java.net.URL; Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ScriptTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/ScriptTest.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Copied: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/UnifiedJEXLTest.java (from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java) URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/UnifiedJEXLTest.java?p2=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/UnifiedJEXLTest.java&p1=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java&r1=1206774&r2=1207941&rev=1207941&view=diff ============================================================================== --- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java (original) +++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/UnifiedJEXLTest.java Tue Nov 29 16:18:59 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.jexl2; +package org.apache.commons.jexl3; import java.io.PrintWriter; import java.io.StringReader; @@ -46,7 +46,7 @@ public class UnifiedJEXLTest extends Jex @Override public void setUp() throws Exception { // ensure jul logging is only error - java.util.logging.Logger.getLogger(JexlEngine.class.getName()).setLevel(java.util.logging.Level.SEVERE); + java.util.logging.Logger.getLogger(org.apache.commons.jexl3.JexlEngine.class.getName()).setLevel(java.util.logging.Level.SEVERE); vars = new HashMap<String, Object>(); context = new MapContext(vars); } Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/UnifiedJEXLTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/UnifiedJEXLTest.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Copied: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/VarTest.java (from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/VarTest.java) URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/VarTest.java?p2=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/VarTest.java&p1=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/VarTest.java&r1=1206774&r2=1207941&rev=1207941&view=diff ============================================================================== --- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/VarTest.java (original) +++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/VarTest.java Tue Nov 29 16:18:59 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.jexl2; +package org.apache.commons.jexl3; import java.util.ArrayList; import java.util.Arrays; @@ -102,7 +102,7 @@ public class VarTest extends JexlTestCas public void testLocalForFuncReturn() throws Exception { JexlContext jc = new NumbersContext(); - Script e = JEXL.createScript("var y = 42; for(var x : numbers()) { if (x > 10) return x } y;"); + JexlScript e = JEXL.createScript("var y = 42; for(var x : numbers()) { if (x > 10) return x } y;"); Object o = e.execute(jc); assertEquals("Result is not 17", new Integer(17), o); @@ -186,7 +186,7 @@ public class VarTest extends JexlTestCas } public void testRefs() throws Exception { - Script e; + JexlScript e; Set<List<String>> vars; Set<List<String>> expect; @@ -234,7 +234,7 @@ public class VarTest extends JexlTestCas } public void testMix() throws Exception { - Script e; + JexlScript e; // x is a parameter, y a context variable, z a local variable e = JEXL.createScript("if (x) { y } else { var z = 2 * x}", "x"); Set<List<String>> vars = e.getVariables(); @@ -249,7 +249,7 @@ public class VarTest extends JexlTestCas } public void testLiteral() throws Exception { - Script e = JEXL.createScript("x.y[['z', 't']]"); + JexlScript e = JEXL.createScript("x.y[['z', 't']]"); Set<List<String>> vars = e.getVariables(); assertEquals(1, vars.size()); assertTrue(eq(mkref(new String[][]{{"x", "y", "[ 'z', 't' ]"}}), vars)); Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/VarTest.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/WhileTest.java (from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/WhileTest.java) URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/WhileTest.java?p2=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/WhileTest.java&p1=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/WhileTest.java&r1=1206774&r2=1207941&rev=1207941&view=diff ============================================================================== --- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/WhileTest.java (original) +++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/WhileTest.java Tue Nov 29 16:18:59 2011 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.jexl2; +package org.apache.commons.jexl3; /** * Tests for while statement. Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/WhileTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/WhileTest.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Copied: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/examples/ArrayTest.java (from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/ArrayTest.java) URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/examples/ArrayTest.java?p2=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/examples/ArrayTest.java&p1=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/ArrayTest.java&r1=1206774&r2=1207941&rev=1207941&view=diff ============================================================================== --- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/ArrayTest.java (original) +++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/examples/ArrayTest.java Tue Nov 29 16:18:59 2011 @@ -15,10 +15,14 @@ * limitations under the License. */ -package org.apache.commons.jexl2.examples; +package org.apache.commons.jexl3.examples; -import org.apache.commons.jexl2.*; import junit.framework.TestCase; +import org.apache.commons.jexl3.Expression; +import org.apache.commons.jexl3.JexlContext; +import org.apache.commons.jexl3.JexlEngine; +import org.apache.commons.jexl3.MapContext; + import java.util.List; import java.util.ArrayList; Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/examples/ArrayTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/examples/ArrayTest.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Copied: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/examples/MethodPropertyTest.java (from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/MethodPropertyTest.java) URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/examples/MethodPropertyTest.java?p2=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/examples/MethodPropertyTest.java&p1=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/MethodPropertyTest.java&r1=1206774&r2=1207941&rev=1207941&view=diff ============================================================================== --- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/MethodPropertyTest.java (original) +++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/examples/MethodPropertyTest.java Tue Nov 29 16:18:59 2011 @@ -15,10 +15,13 @@ * limitations under the License. */ -package org.apache.commons.jexl2.examples; +package org.apache.commons.jexl3.examples; -import org.apache.commons.jexl2.*; import junit.framework.TestCase; +import org.apache.commons.jexl3.Expression; +import org.apache.commons.jexl3.JexlContext; +import org.apache.commons.jexl3.JexlEngine; +import org.apache.commons.jexl3.MapContext; /** * Simple example to show how to access method and properties. Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/examples/MethodPropertyTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/examples/MethodPropertyTest.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Copied: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/examples/Output.java (from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/Output.java) URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/examples/Output.java?p2=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/examples/Output.java&p1=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/Output.java&r1=1206774&r2=1207941&rev=1207941&view=diff ============================================================================== --- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/examples/Output.java (original) +++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/examples/Output.java Tue Nov 29 16:18:59 2011 @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.commons.jexl2.examples; +package org.apache.commons.jexl3.examples; import junit.framework.TestCase; /** Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/examples/Output.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/examples/Output.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Copied: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/internal/introspection/DiscoveryTest.java (from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/internal/introspection/DiscoveryTest.java) URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/internal/introspection/DiscoveryTest.java?p2=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/internal/introspection/DiscoveryTest.java&p1=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/internal/introspection/DiscoveryTest.java&r1=1206774&r2=1207941&rev=1207941&view=diff ============================================================================== --- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/internal/introspection/DiscoveryTest.java (original) +++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/internal/introspection/DiscoveryTest.java Tue Nov 29 16:18:59 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.jexl2.internal.introspection; +package org.apache.commons.jexl3.internal.introspection; import java.util.ArrayList; import java.util.HashMap; @@ -22,20 +22,23 @@ import java.util.List; import java.util.Map; -import org.apache.commons.jexl2.JexlEngine; -import org.apache.commons.jexl2.JexlTestCase; -import org.apache.commons.jexl2.introspection.Uberspect; - -import org.apache.commons.jexl2.internal.Introspector; -import org.apache.commons.jexl2.internal.AbstractExecutor; -import org.apache.commons.jexl2.internal.PropertyGetExecutor; -import org.apache.commons.jexl2.internal.PropertySetExecutor; -import org.apache.commons.jexl2.internal.DuckGetExecutor; -import org.apache.commons.jexl2.internal.DuckSetExecutor; -import org.apache.commons.jexl2.internal.ListGetExecutor; -import org.apache.commons.jexl2.internal.ListSetExecutor; -import org.apache.commons.jexl2.internal.MapGetExecutor; -import org.apache.commons.jexl2.internal.MapSetExecutor; +import org.apache.commons.jexl3.JexlEngine; +import org.apache.commons.jexl3.JexlTestCase; +import org.apache.commons.jexl3.JexlEngine; +import org.apache.commons.jexl3.JexlTestCase; +import org.apache.commons.jexl3.introspection.Uberspect; + +import org.apache.commons.jexl3.internal.AbstractExecutor; +import org.apache.commons.jexl3.internal.PropertyGetExecutor; +import org.apache.commons.jexl3.internal.PropertySetExecutor; +import org.apache.commons.jexl3.internal.DuckGetExecutor; +import org.apache.commons.jexl3.internal.DuckSetExecutor; +import org.apache.commons.jexl3.internal.ListGetExecutor; +import org.apache.commons.jexl3.internal.Introspector; +import org.apache.commons.jexl3.internal.MapGetExecutor; +import org.apache.commons.jexl3.internal.MapSetExecutor; +import org.apache.commons.jexl3.internal.ListSetExecutor; +import org.apache.commons.jexl3.introspection.Uberspect; /** * Tests for checking introspection discovery. Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/internal/introspection/DiscoveryTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/internal/introspection/DiscoveryTest.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Copied: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/internal/introspection/MethodKeyTest.java (from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/internal/introspection/MethodKeyTest.java) URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/internal/introspection/MethodKeyTest.java?p2=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/internal/introspection/MethodKeyTest.java&p1=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/internal/introspection/MethodKeyTest.java&r1=1206774&r2=1207941&rev=1207941&view=diff ============================================================================== --- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/internal/introspection/MethodKeyTest.java (original) +++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/internal/introspection/MethodKeyTest.java Tue Nov 29 16:18:59 2011 @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.jexl2.internal.introspection; -import org.apache.commons.jexl2.internal.introspection.MethodKey; -import org.apache.commons.jexl2.internal.introspection.ClassMap; +package org.apache.commons.jexl3.internal.introspection; +import org.apache.commons.jexl3.internal.introspection.MethodKey; +import org.apache.commons.jexl3.internal.introspection.ClassMap; import junit.framework.TestCase; /** * Checks the CacheMap.MethodKey implementation Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/internal/introspection/MethodKeyTest.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/junit/Asserter.java (from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/Asserter.java) URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/junit/Asserter.java?p2=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/junit/Asserter.java&p1=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/Asserter.java&r1=1206774&r2=1207941&rev=1207941&view=diff ============================================================================== --- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/Asserter.java (original) +++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/junit/Asserter.java Tue Nov 29 16:18:59 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.jexl2.junit; +package org.apache.commons.jexl3.junit; import java.math.BigDecimal; import java.util.HashMap; @@ -22,13 +22,13 @@ import java.util.Map; import junit.framework.Assert; -import org.apache.commons.jexl2.Expression; -import org.apache.commons.jexl2.JexlArithmetic; -import org.apache.commons.jexl2.JexlContext; -import org.apache.commons.jexl2.MapContext; -import org.apache.commons.jexl2.JexlEngine; -import org.apache.commons.jexl2.JexlException; -import org.apache.commons.jexl2.JexlThreadedArithmetic; +import org.apache.commons.jexl3.Expression; +import org.apache.commons.jexl3.JexlArithmetic; +import org.apache.commons.jexl3.JexlContext; +import org.apache.commons.jexl3.MapContext; +import org.apache.commons.jexl3.JexlEngine; +import org.apache.commons.jexl3.JexlException; +import org.apache.commons.jexl3.JexlThreadedArithmetic; /** * A utility class for performing JUnit based assertions using Jexl Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/junit/Asserter.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/junit/Asserter.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Copied: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/junit/AsserterTest.java (from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/AsserterTest.java) URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/junit/AsserterTest.java?p2=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/junit/AsserterTest.java&p1=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/AsserterTest.java&r1=1206774&r2=1207941&rev=1207941&view=diff ============================================================================== --- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/AsserterTest.java (original) +++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/junit/AsserterTest.java Tue Nov 29 16:18:59 2011 @@ -15,13 +15,14 @@ * limitations under the License. */ /* $Id$ */ -package org.apache.commons.jexl2.junit; +package org.apache.commons.jexl3.junit; import junit.framework.AssertionFailedError; -import org.apache.commons.jexl2.JexlEngine; -import org.apache.commons.jexl2.JexlTestCase; -import org.apache.commons.jexl2.Foo; +import org.apache.commons.jexl3.Foo; +import org.apache.commons.jexl3.JexlEngine; +import org.apache.commons.jexl3.JexlTestCase; +import org.apache.commons.jexl3.JexlEngine; /** * Simple testcases Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/junit/AsserterTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/junit/AsserterTest.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Copied: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/junit/package.html (from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/package.html) URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/junit/package.html?p2=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/junit/package.html&p1=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/package.html&r1=1206774&r2=1207941&rev=1207941&view=diff ============================================================================== --- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/junit/package.html (original) +++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/junit/package.html Tue Nov 29 16:18:59 2011 @@ -16,7 +16,7 @@ limitations under the License. --> <head> - <title>Package Documentation for org.apache.commons.jexl2.junit Package</title> + <title>Package Documentation for org.apache.commons.jexl3.junit Package</title> </head> <body bgcolor="white"> Using JEXL expressions in JUnit assertions. Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/junit/package.html ------------------------------------------------------------------------------ svn:eol-style = native Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/junit/package.html ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Copied: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/parser/ParserTest.java (from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/parser/ParserTest.java) URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/parser/ParserTest.java?p2=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/parser/ParserTest.java&p1=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/parser/ParserTest.java&r1=1206774&r2=1207941&rev=1207941&view=diff ============================================================================== --- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/parser/ParserTest.java (original) +++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/parser/ParserTest.java Tue Nov 29 16:18:59 2011 @@ -14,11 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.commons.jexl2.parser; +package org.apache.commons.jexl3.parser; import java.io.StringReader; import junit.framework.TestCase; +import org.apache.commons.jexl3.parser.Parser; /** * @since 1.0 Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/parser/ParserTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/parser/ParserTest.java ------------------------------------------------------------------------------ svn:keywords = Date Author Id Revision HeadURL Copied: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineOptionalTest.java (from r1206774, commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/scripting/JexlScriptEngineOptionalTest.java) URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineOptionalTest.java?p2=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineOptionalTest.java&p1=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/scripting/JexlScriptEngineOptionalTest.java&r1=1206774&r2=1207941&rev=1207941&view=diff ============================================================================== --- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/scripting/JexlScriptEngineOptionalTest.java (original) +++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineOptionalTest.java Tue Nov 29 16:18:59 2011 @@ -16,7 +16,7 @@ * */ -package org.apache.commons.jexl2.scripting; +package org.apache.commons.jexl3.scripting; import java.io.StringWriter; import javax.script.Compilable; Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineOptionalTest.java ------------------------------------------------------------------------------ svn:eol-style = native Copied: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java (from r1206774, 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/jexl3/scripting/JexlScriptEngineTest.java?p2=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java&p1=commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/scripting/JexlScriptEngineTest.java&r1=1206774&r2=1207941&rev=1207941&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/jexl3/scripting/JexlScriptEngineTest.java Tue Nov 29 16:18:59 2011 @@ -16,7 +16,7 @@ * */ -package org.apache.commons.jexl2.scripting; +package org.apache.commons.jexl3.scripting; import java.io.Reader; import java.util.Arrays; @@ -28,16 +28,20 @@ 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"); + private static final List<String> NAMES = Arrays.asList("JEXL", "Jexl", "jexl", + "JEXL2", "Jexl2", "jexl2", + "JEXL3", "Jexl3", "jexl3"); + private static final List<String> EXTENSIONS = Arrays.asList("jexl", "jexl2", "jexl3"); + private static final List<String> MIMES = Arrays.asList("application/x-jexl", + "application/x-jexl2", + "application/x-jexl3"); public void testScriptEngineFactory() throws Exception { JexlScriptEngineFactory factory = new JexlScriptEngineFactory(); assertEquals("JEXL Engine", factory.getParameter(ScriptEngine.ENGINE)); - assertEquals("2.0", factory.getParameter(ScriptEngine.ENGINE_VERSION)); + assertEquals("3.0", factory.getParameter(ScriptEngine.ENGINE_VERSION)); assertEquals("JEXL", factory.getParameter(ScriptEngine.LANGUAGE)); - assertEquals("2.0", factory.getParameter(ScriptEngine.LANGUAGE_VERSION)); + assertEquals("3.0", factory.getParameter(ScriptEngine.LANGUAGE_VERSION)); assertNull(factory.getParameter("THREADING")); assertEquals(NAMES, factory.getParameter(ScriptEngine.NAME)); assertEquals(EXTENSIONS, factory.getExtensions()); @@ -67,7 +71,7 @@ public class JexlScriptEngineTest extend public void testScripting() throws Exception { ScriptEngineManager manager = new ScriptEngineManager(); assertNotNull("Manager should not be null", manager); - ScriptEngine engine = manager.getEngineByName("jexl2"); + ScriptEngine engine = manager.getEngineByName("jexl3"); final Integer initialValue = Integer.valueOf(123); assertEquals(initialValue,engine.eval("123")); assertEquals(initialValue,engine.eval("0;123"));// multiple statements @@ -94,7 +98,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("jexl2"); + ScriptEngine engine = manager.getEngineByName("jexl3"); assertNotNull("Engine should not be null (name)", engine); try { engine.eval((String)null); Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl3/scripting/JexlScriptEngineTest.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision