Commits

Anonymous committed 5653dfb

Issue number:
Obtained from:
Submitted by:
Reviewed by:

git-svn-id: http://svn.opensymphony.com/svn/xwork/trunk@223e221344d-f017-0410-9bd5-d282ab1896d7

Comments (0)

Files changed (1)

src/test/com/opensymphony/xwork/interceptor/ModelDrivenInterceptorTest.java

 
     Action action;
     Mock mockActionInvocation;
-    Mock mockActionProxy;
     ModelDrivenInterceptor modelDrivenInterceptor;
     Object model;
 
     public void testModelDrivenGetsPushedOntoStack() throws Exception {
         OgnlValueStack stack = new OgnlValueStack();
         action = new ModelDrivenAction();
-        mockActionProxy.expectAndReturn("getAction", action);
+        mockActionInvocation.expectAndReturn("getAction", action);
         mockActionInvocation.expectAndReturn("getStack", stack);
 
         modelDrivenInterceptor.before((ActionInvocation) mockActionInvocation.proxy());
 
     public void testStackNotModifedForNormalAction() throws Exception {
         action = new ActionSupport();
-        mockActionProxy.expectAndReturn("getAction", action);
+        mockActionInvocation.expectAndReturn("getAction", action);
 
         // nothing should happen
         modelDrivenInterceptor.before((ActionInvocation) mockActionInvocation.proxy());
     }
 
     protected void setUp() throws Exception {
-        mockActionProxy = new Mock(ActionProxy.class);
         mockActionInvocation = new Mock(ActionInvocation.class);
-        mockActionInvocation.expectAndReturn("getProxy", mockActionProxy.proxy());
         modelDrivenInterceptor = new ModelDrivenInterceptor();
         model = new Date(); // any object will do
     }
 
     protected void tearDown() throws Exception {
-        mockActionProxy.verify();
         mockActionInvocation.verify();
     }