You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by lu...@apache.org on 2016/02/04 08:20:21 UTC
[5/7] struts git commit: Updates test to cover usage of new listener
Updates test to cover usage of new listener
Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/f755e01c
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/f755e01c
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/f755e01c
Branch: refs/heads/master
Commit: f755e01c182e48cab00244ba16f3f6eafa746880
Parents: 8071052
Author: Lukasz Lenart <lu...@apache.org>
Authored: Thu Feb 4 08:05:46 2016 +0100
Committer: Lukasz Lenart <lu...@apache.org>
Committed: Thu Feb 4 08:05:46 2016 +0100
----------------------------------------------------------------------
.../MessageStoreInterceptorTest.java | 234 +------------------
1 file changed, 7 insertions(+), 227 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/struts/blob/f755e01c/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java b/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java
index 77b9da1..9fc8396 100644
--- a/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java
+++ b/core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java
@@ -28,6 +28,7 @@ import java.util.List;
import java.util.Map;
import com.opensymphony.xwork2.ActionProxy;
+import com.opensymphony.xwork2.interceptor.PreResultListener;
import org.apache.struts2.ServletActionContext;
import org.apache.struts2.StrutsInternalTestCase;
import org.apache.struts2.result.ServletActionRedirectResult;
@@ -63,84 +64,6 @@ public class MessageStoreInterceptorTest extends StrutsInternalTestCase {
ServletActionContext.setResponse(response);
}
- public void testStoreMessage() throws Exception {
- MessageStoreInterceptor interceptor = new MessageStoreInterceptor();
- interceptor.setAllowRequestParameterSwitch(true);
- interceptor.setOperationMode(MessageStoreInterceptor.STORE_MODE);
-
-
- Map paramMap = new LinkedHashMap();
- Map sessionMap = new LinkedHashMap();
-
- ActionSupport action = new ActionSupport();
- action.addActionError("some action error 1");
- action.addActionError("some action error 2");
- action.addActionMessage("some action message 1");
- action.addActionMessage("some action message 2");
- action.addFieldError("field1", "some field error 1");
- action.addFieldError("field2", "some field error 2");
-
- ActionContext actionContext = new ActionContext(new HashMap());
- actionContext.put(ActionContext.PARAMETERS, paramMap);
- actionContext.put(ActionContext.SESSION, sessionMap);
-
- HttpSession mockedSession = EasyMock.createControl().createMock(HttpSession.class);
- HttpServletRequest mockedRequest = EasyMock.createControl().createMock(HttpServletRequest.class);
- mockedRequest.getSession(false);
- EasyMock.expectLastCall().andReturn(mockedSession);
- EasyMock.expectLastCall().once();
- ServletActionContext.setRequest(mockedRequest);
-
- EasyMock.replay(mockedRequest);
-
- // Mock (ActionInvocation)
- ActionInvocation mockActionInvocation = EasyMock.createControl().createMock(ActionInvocation.class);
- mockActionInvocation.getInvocationContext();
- EasyMock.expectLastCall().andReturn(actionContext);
- EasyMock.expectLastCall().anyTimes();
-
- mockActionInvocation.invoke();
- EasyMock.expectLastCall().andReturn(Action.SUCCESS);
-
- mockActionInvocation.getAction();
- EasyMock.expectLastCall().andReturn(action);
-
- mockActionInvocation.getResult();
- EasyMock.expectLastCall().andReturn(new ServletActionRedirectResult());
-
- EasyMock.replay(mockActionInvocation);
-
- interceptor.init();
- interceptor.intercept(mockActionInvocation);
- interceptor.destroy();
-
- assertEquals(sessionMap.size(), 3);
- assertTrue(sessionMap.containsKey(MessageStoreInterceptor.actionErrorsSessionKey));
- assertTrue(sessionMap.containsKey(MessageStoreInterceptor.actionMessagesSessionKey));
- assertTrue(sessionMap.containsKey(MessageStoreInterceptor.fieldErrorsSessionKey));
-
- List actionErrors = (List) sessionMap.get(MessageStoreInterceptor.actionErrorsSessionKey);
- List actionMessages = (List) sessionMap.get(MessageStoreInterceptor.actionMessagesSessionKey);
- Map fieldErrors = (Map) sessionMap.get(MessageStoreInterceptor.fieldErrorsSessionKey);
-
- assertEquals(actionErrors.size(), 2);
- assertEquals(actionMessages.size(), 2);
- assertEquals(fieldErrors.size(), 2);
-
- assertTrue(actionErrors.contains("some action error 1"));
- assertTrue(actionErrors.contains("some action error 2"));
- assertTrue(actionMessages.contains("some action message 1"));
- assertTrue(actionMessages.contains("some action message 2"));
- assertTrue(fieldErrors.containsKey("field1"));
- assertTrue(fieldErrors.containsKey("field2"));
- assertEquals(((List)fieldErrors.get("field1")).size(), 1);
- assertEquals(((List)fieldErrors.get("field2")).size(), 1);
- assertEquals(((List)fieldErrors.get("field1")).get(0), "some field error 1");
- assertEquals(((List)fieldErrors.get("field2")).get(0), "some field error 2");
-
- EasyMock.verify(mockActionInvocation);
- }
-
public void testIgnoreMessageWithoutSession() throws Exception {
MessageStoreInterceptor interceptor = new MessageStoreInterceptor();
interceptor.setAllowRequestParameterSwitch(true);
@@ -174,8 +97,8 @@ public class MessageStoreInterceptorTest extends StrutsInternalTestCase {
mockActionInvocation.invoke();
EasyMock.expectLastCall().andReturn(Action.SUCCESS);
- mockActionInvocation.getAction();
- EasyMock.expectLastCall().andReturn(action);
+ mockActionInvocation.addPreResultListener(EasyMock.<PreResultListener>anyObject());
+ EasyMock.expectLastCall();
EasyMock.replay(mockActionInvocation);
@@ -241,8 +164,8 @@ public class MessageStoreInterceptorTest extends StrutsInternalTestCase {
EasyMock.expectLastCall().andReturn(action);
EasyMock.expectLastCall().anyTimes();
- mockActionInvocation.getResult();
- EasyMock.expectLastCall().andReturn(new ServletActionRedirectResult());
+ mockActionInvocation.addPreResultListener(EasyMock.<PreResultListener>anyObject());
+ EasyMock.expectLastCall();
EasyMock.replay(mockActionInvocation);
@@ -301,81 +224,15 @@ public class MessageStoreInterceptorTest extends StrutsInternalTestCase {
EasyMock.expectLastCall().andReturn(actionContext);
EasyMock.expectLastCall().anyTimes();
- mockActionInvocation.invoke();
- EasyMock.expectLastCall().andReturn(Action.SUCCESS);
-
- mockActionInvocation.getAction();
- EasyMock.expectLastCall().andReturn(action);
- EasyMock.expectLastCall().anyTimes();
-
- mockActionInvocation.getResult();
- EasyMock.expectLastCall().andReturn(new ServletActionRedirectResult());
-
- EasyMock.replay(mockActionInvocation);
+ mockActionInvocation.addPreResultListener(EasyMock.<PreResultListener>anyObject());
+ EasyMock.expectLastCall();
- interceptor.init();
- interceptor.intercept(mockActionInvocation);
- interceptor.destroy();
-
- assertEquals(3, sessionMap.size());
- assertTrue(sessionMap.containsKey(MessageStoreInterceptor.actionErrorsSessionKey));
- assertTrue(sessionMap.containsKey(MessageStoreInterceptor.actionMessagesSessionKey));
- assertTrue(sessionMap.containsKey(MessageStoreInterceptor.fieldErrorsSessionKey));
-
- List actionErrors = (List) sessionMap.get(MessageStoreInterceptor.actionErrorsSessionKey);
- List actionMessages = (List) sessionMap.get(MessageStoreInterceptor.actionMessagesSessionKey);
- Map fieldErrors = (Map) sessionMap.get(MessageStoreInterceptor.fieldErrorsSessionKey);
-
- assertEquals(2, actionErrors.size());
- assertEquals(2, actionMessages.size());
- assertEquals(2, fieldErrors.size());
-
- assertTrue(actionErrors.contains("some action error 1"));
- assertTrue(actionErrors.contains("some action error 2"));
- assertTrue(actionMessages.contains("some action message 1"));
- assertTrue(actionMessages.contains("some action message 2"));
- assertTrue(fieldErrors.containsKey("field1"));
- assertTrue(fieldErrors.containsKey("field2"));
- assertEquals(((List)fieldErrors.get("field1")).size(), 1);
- assertEquals(((List)fieldErrors.get("field2")).size(), 1);
- assertEquals(((List)fieldErrors.get("field1")).get(0), "some field error 1");
- assertEquals(((List)fieldErrors.get("field2")).get(0), "some field error 2");
-
- EasyMock.verify(mockActionInvocation);
-
- action = new ActionSupport();
-
- mockActionInvocation = EasyMock.createControl().createMock(ActionInvocation.class);
mockActionInvocation.invoke();
EasyMock.expectLastCall().andReturn(Action.SUCCESS);
- sessionMap.put(MessageStoreInterceptor.actionErrorsSessionKey, actionErrors);
- sessionMap.put(MessageStoreInterceptor.actionMessagesSessionKey, actionMessages);
- sessionMap.put(MessageStoreInterceptor.fieldErrorsSessionKey, fieldErrors);
-
- mockedSession = EasyMock.createControl().createMock(HttpSession.class);
- mockedRequest = EasyMock.createControl().createMock(HttpServletRequest.class);
- mockedRequest.getSession(false);
- EasyMock.expectLastCall().andReturn(mockedSession);
- EasyMock.expectLastCall().once();
- ServletActionContext.setRequest(mockedRequest);
-
- EasyMock.replay(mockedRequest);
-
- actionContext = new ActionContext(new HashMap());
- actionContext.put(ActionContext.PARAMETERS, paramMap);
- actionContext.put(ActionContext.SESSION, sessionMap);
-
- mockActionInvocation.getInvocationContext();
- EasyMock.expectLastCall().andReturn(actionContext);
- EasyMock.expectLastCall().anyTimes();
-
mockActionInvocation.getAction();
EasyMock.expectLastCall().andReturn(action);
EasyMock.expectLastCall().anyTimes();
-
- mockActionInvocation.getResult();
- EasyMock.expectLastCall().andReturn(new ServletActionRedirectResult());
EasyMock.replay(mockActionInvocation);
@@ -383,18 +240,6 @@ public class MessageStoreInterceptorTest extends StrutsInternalTestCase {
interceptor.intercept(mockActionInvocation);
interceptor.destroy();
- assertEquals(action.getActionErrors().size(), 2);
- assertEquals(action.getActionMessages().size(), 2);
- assertEquals(action.getFieldErrors().size(), 2);
- assertTrue(action.getActionErrors().contains("some action error 1"));
- assertTrue(action.getActionErrors().contains("some action error 2"));
- assertTrue(action.getActionMessages().contains("some action message 1"));
- assertTrue(action.getActionMessages().contains("some action message 2"));
- assertEquals(((List)action.getFieldErrors().get("field1")).size(), 1);
- assertEquals(((List)action.getFieldErrors().get("field2")).size(), 1);
- assertEquals(((List)action.getFieldErrors().get("field1")).get(0), "some field error 1");
- assertEquals(((List)action.getFieldErrors().get("field2")).get(0), "some field error 2");
-
EasyMock.verify(mockActionInvocation);
}
@@ -467,69 +312,4 @@ public class MessageStoreInterceptorTest extends StrutsInternalTestCase {
}
- public void testSessionWasInvalidated() throws Exception {
- // given
- ActionContext actionContext = new ActionContext(new HashMap());
- actionContext.put(ActionContext.PARAMETERS, new LinkedHashMap());
-
- ActionInvocation mockActionInvocation = EasyMock.createControl().createMock(ActionInvocation.class);
-
- mockActionInvocation.getInvocationContext();
- EasyMock.expectLastCall().andReturn(actionContext);
- EasyMock.expectLastCall().anyTimes();
-
- mockActionInvocation.invoke();
- EasyMock.expectLastCall().andReturn(Action.SUCCESS);
-
- EasyMock.replay(mockActionInvocation);
-
- HttpServletRequest mockedRequest = EasyMock.createControl().createMock(HttpServletRequest.class);
- mockedRequest.getSession(false);
- EasyMock.expectLastCall().andReturn(null);
- EasyMock.expectLastCall().once();
- ServletActionContext.setRequest(mockedRequest);
-
- EasyMock.replay(mockedRequest);
-
- // when
- MessageStoreInterceptor msi = new MessageStoreInterceptor();
- msi.intercept(mockActionInvocation);
-
- // then
- EasyMock.verify(mockActionInvocation);
- EasyMock.verify(mockedRequest);
- }
-
- public void testResponseWasComitted() throws Exception {
- // given
- ActionContext actionContext = new ActionContext(new HashMap());
- actionContext.put(ActionContext.PARAMETERS, new LinkedHashMap());
-
- ActionInvocation mockActionInvocation = EasyMock.createControl().createMock(ActionInvocation.class);
-
- mockActionInvocation.getInvocationContext();
- EasyMock.expectLastCall().andReturn(actionContext);
- EasyMock.expectLastCall().anyTimes();
-
- mockActionInvocation.invoke();
- EasyMock.expectLastCall().andReturn(Action.SUCCESS);
-
- EasyMock.replay(mockActionInvocation);
-
- HttpServletResponse mockedResponse = EasyMock.createControl().createMock(HttpServletResponse.class);
- mockedResponse.isCommitted();
- EasyMock.expectLastCall().andReturn(true);
- EasyMock.expectLastCall().once();
- ServletActionContext.setResponse(mockedResponse);
-
- EasyMock.replay(mockedResponse);
-
- // when
- MessageStoreInterceptor msi = new MessageStoreInterceptor();
- msi.intercept(mockActionInvocation);
-
- // then
- EasyMock.verify(mockActionInvocation);
- EasyMock.verify(mockedResponse);
- }
}