Return-Path: Delivered-To: apmail-struts-commits-archive@minotaur.apache.org Received: (qmail 14397 invoked from network); 25 Mar 2009 15:14:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 25 Mar 2009 15:14:47 -0000 Received: (qmail 30588 invoked by uid 500); 25 Mar 2009 15:14:47 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 30509 invoked by uid 500); 25 Mar 2009 15:14:46 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 30500 invoked by uid 99); 25 Mar 2009 15:14:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Mar 2009 15:14:46 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Wed, 25 Mar 2009 15:14:44 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BB84B23888AF; Wed, 25 Mar 2009 15:14:23 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r758299 - /struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/AbstractTest.java Date: Wed, 25 Mar 2009 15:14:21 -0000 To: commits@struts.apache.org From: musachy@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090325151423.BB84B23888AF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: musachy Date: Wed Mar 25 15:14:17 2009 New Revision: 758299 URL: http://svn.apache.org/viewvc?rev=758299&view=rev Log: Update failing tests (update Easymock expected method calls) Modified: struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/AbstractTest.java Modified: struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/AbstractTest.java URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/AbstractTest.java?rev=758299&r1=758298&r2=758299&view=diff ============================================================================== --- struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/AbstractTest.java (original) +++ struts/struts2/trunk/plugins/javatemplates/src/test/java/org/apache/struts2/views/java/simple/AbstractTest.java Wed Mar 25 15:14:17 2009 @@ -99,10 +99,12 @@ protected void expectFind(String expr, Class toClass, Object returnVal) { EasyMock.expect(stack.findValue(expr, toClass)).andReturn(returnVal); + EasyMock.expect(stack.findValue(expr, toClass, false)).andReturn(returnVal); } protected void expectFind(String expr, Object returnVal) { - EasyMock.expect(stack.findValue(expr)).andReturn(returnVal); + EasyMock.expect(stack.findValue(expr)).andReturn(returnVal).anyTimes(); + EasyMock.expect(stack.findValue(expr, false)).andReturn(returnVal).anyTimes(); } protected void setUpStack() {