Return-Path: Delivered-To: apmail-jakarta-commons-dev-archive@www.apache.org Received: (qmail 9283 invoked from network); 5 Apr 2006 12:22:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 5 Apr 2006 12:22:13 -0000 Received: (qmail 89126 invoked by uid 500); 5 Apr 2006 12:22:10 -0000 Delivered-To: apmail-jakarta-commons-dev-archive@jakarta.apache.org Received: (qmail 88714 invoked by uid 500); 5 Apr 2006 12:22:09 -0000 Mailing-List: contact commons-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Jakarta Commons Developers List" Reply-To: "Jakarta Commons Developers List" Delivered-To: mailing list commons-dev@jakarta.apache.org Received: (qmail 88703 invoked by uid 500); 5 Apr 2006 12:22:09 -0000 Received: (qmail 88700 invoked by uid 99); 5 Apr 2006 12:22:09 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Apr 2006 05:22:09 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 05 Apr 2006 05:22:08 -0700 Received: (qmail 9036 invoked by uid 65534); 5 Apr 2006 12:21:48 -0000 Message-ID: <20060405122148.9035.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r391599 - /jakarta/commons/proper/jexl/trunk/src/test/org/apache/commons/jexl/JexlTest.java Date: Wed, 05 Apr 2006 12:21:47 -0000 To: commons-cvs@jakarta.apache.org From: dion@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: dion Date: Wed Apr 5 05:21:46 2006 New Revision: 391599 URL: http://svn.apache.org/viewcvs?rev=391599&view=rev Log: Add postResolver test Modified: jakarta/commons/proper/jexl/trunk/src/test/org/apache/commons/jexl/JexlTest.java Modified: jakarta/commons/proper/jexl/trunk/src/test/org/apache/commons/jexl/JexlTest.java URL: http://svn.apache.org/viewcvs/jakarta/commons/proper/jexl/trunk/src/test/org/apache/commons/jexl/JexlTest.java?rev=391599&r1=391598&r2=391599&view=diff ============================================================================== --- jakarta/commons/proper/jexl/trunk/src/test/org/apache/commons/jexl/JexlTest.java (original) +++ jakarta/commons/proper/jexl/trunk/src/test/org/apache/commons/jexl/JexlTest.java Wed Apr 5 05:21:46 2006 @@ -81,7 +81,7 @@ Object o = e.evaluate(jc); assertTrue("o not instanceof String", o instanceof String); - assertTrue("o incorrect", o.equals(GET_METHOD_STRING)); + assertEquals("o incorrect", GET_METHOD_STRING, o); } /** @@ -745,47 +745,40 @@ * first, a simple override */ - Expression expr = - ExpressionFactory.createExpression("foo.bar"); - + Expression expr = ExpressionFactory.createExpression("foo.bar"); expr.addPreResolver(new FlatResolver()); JexlContext jc = JexlHelper.createContext(); - Foo foo = new Foo(); - jc.getVars().put("foo.bar", "flat value"); jc.getVars().put("foo", foo ); Object o = expr.evaluate(jc); - - assertEquals("flat override", o,"flat value"); + assertEquals("flat override", "flat value", o); /* * now, let the resolver not find it and have it drop to jexl */ - - expr = - ExpressionFactory.createExpression("foo.bar.length()"); - + expr = ExpressionFactory.createExpression("foo.bar.length()"); expr.addPreResolver(new FlatResolver()); - o = expr.evaluate(jc); - - assertEquals("flat override 1", o,new Integer(GET_METHOD_STRING.length())); + assertEquals("flat override 1", new Integer(GET_METHOD_STRING.length()), o); /* * now, let the resolver not find it and NOT drop to jexl */ - expr = - ExpressionFactory.createExpression("foo.bar.length()"); - + expr = ExpressionFactory.createExpression("foo.bar.length()"); expr.addPreResolver(new FlatResolver(false)); - o = expr.evaluate(jc); - assertEquals("flat override 2", o, null); + + // now for a post resolver + expr = ExpressionFactory.createExpression("foo.bar.baz"); + Long result = new Long(1); + jc.getVars().put("foo.bar.baz", result); + expr.addPostResolver(new FlatResolver()); + assertEquals("flat override", result, expr.evaluate(jc)); } --------------------------------------------------------------------- To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: commons-dev-help@jakarta.apache.org