svn commit: r1209789 - /commons/proper/jexl/branches/COMMONS_JEXL_2_0_1_TEST/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java

[sebb]

Author: sebb
Date: Sat Dec  3 00:06:00 2011
New Revision: 1209789

URL: http://svn.apache.org/viewvc?rev=1209789&view=rev
Log:
Fix remaining test failures

Modified:
    
commons/proper/jexl/branches/COMMONS_JEXL_2_0_1_TEST/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java

Modified: 
commons/proper/jexl/branches/COMMONS_JEXL_2_0_1_TEST/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java
URL: 
http://svn.apache.org/viewvc/commons/proper/jexl/branches/COMMONS_JEXL_2_0_1_TEST/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java?rev=1209789&r1=1209788&r2=1209789&view=diff
==============================================================================
--- 
commons/proper/jexl/branches/COMMONS_JEXL_2_0_1_TEST/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java
 (original)
+++ 
commons/proper/jexl/branches/COMMONS_JEXL_2_0_1_TEST/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java
 Sat Dec  3 00:06:00 2011
@@ -125,7 +125,7 @@ public class UnifiedJEXLTest extends Jex
     public void testImmediate() throws Exception {
         JexlContext none = null;
         UnifiedJEXL.Expression expr = EL.parse("${'Hello ' + 'World!'}");
-        assertSame("prepare should return same expression", expr, 
expr.prepare(none)); // 2.1 currently fails
+        assertEquals("prepare should return immediate expression", "Hello 
World!", expr.prepare(none).asString());
         Object o = expr.evaluate(none);
         assertTrue("expression should be immediate", expr.isImmediate());
         assertEquals("Hello World!", o);
@@ -143,7 +143,7 @@ public class UnifiedJEXLTest extends Jex
     public void testDeferred() throws Exception {
         JexlContext none = null;
         UnifiedJEXL.Expression expr = EL.parse("#{'world'}");
-        assertSame("prepare should return same expression", expr, 
expr.prepare(none)); // 2.1 currently fails
+        assertEquals("prepare should return immediate expression", 
"${'world'}", expr.prepare(none).asString());
         Object o = expr.evaluate(none);
         assertTrue("expression should be deferred", expr.isDeferred());
         assertEquals("world", o);