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() {
