Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5620F9BB2 for ; Sat, 3 Dec 2011 00:06:25 +0000 (UTC) Received: (qmail 58442 invoked by uid 500); 3 Dec 2011 00:06:25 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 58372 invoked by uid 500); 3 Dec 2011 00:06:25 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 58365 invoked by uid 99); 3 Dec 2011 00:06:25 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Dec 2011 00:06:25 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 03 Dec 2011 00:06:22 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D866D23889DA for ; Sat, 3 Dec 2011 00:06:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1209789 - /commons/proper/jexl/branches/COMMONS_JEXL_2_0_1_TEST/src/test/java/org/apache/commons/jexl2/UnifiedJEXLTest.java Date: Sat, 03 Dec 2011 00:06:00 -0000 To: commits@commons.apache.org From: sebb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111203000600.D866D23889DA@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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);