Spring/spring-webflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sanity tests

Browse Source
This commit is contained in:
Keith Donald
2009-04-16 18:25:35 +00:00
parent f13eac6c63
commit 4e5c711b9d
3 changed files with 71 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-webflow/src/main/java/org/springframework/webflow/mvc/view/AbstractMvcView.java
View File

@@ -187,7 +187,7 @@ public abstract class AbstractMvcView implements View {
}
public boolean userEventQueued() {
return getEventId() != null;
return !userEventProcessed && getEventId() != null;
}
public void processUserEvent() {
@@ -236,7 +236,7 @@ public abstract class AbstractMvcView implements View {
}
public Object getUserEventState() {
return new ViewActionStateHolder(eventId, mappingResults);
return new ViewActionStateHolder(eventId, userEventProcessed, mappingResults);
}
public String toString() {
@@ -320,6 +320,7 @@ public abstract class AbstractMvcView implements View {
*/
void restoreState(ViewActionStateHolder stateHolder) {
eventId = stateHolder.getEventId();
userEventProcessed = stateHolder.getUserEventProcessed();
mappingResults = stateHolder.getMappingResults();
}

11
spring-webflow/src/main/java/org/springframework/webflow/mvc/view/ViewActionStateHolder.java
View File

@@ -19,7 +19,7 @@ import org.springframework.binding.mapping.MappingResults;
import org.springframework.core.style.ToStringCreator;
/**
* Holder class for passing view state through a redirect.
* Holder class for passing Spring MVC view action state through a redirect.
*
* @author Scott Andrews
*/
@@ -29,10 +29,13 @@ public class ViewActionStateHolder {
private String eventId;
private boolean userEventProcessed;
private MappingResults mappingResults;
public ViewActionStateHolder(String eventId, MappingResults mappingResults) {
public ViewActionStateHolder(String eventId, boolean userEventProcessed, MappingResults mappingResults) {
this.eventId = eventId;
this.userEventProcessed = userEventProcessed;
this.mappingResults = mappingResults;
}
@@ -40,6 +43,10 @@ public class ViewActionStateHolder {
return eventId;
}
public boolean getUserEventProcessed() {
return userEventProcessed;
}
public MappingResults getMappingResults() {
return mappingResults;
}

59
spring-webflow/src/test/java/org/springframework/webflow/mvc/view/MvcViewTests.java
View File

@@ -133,6 +133,7 @@ public class MvcViewTests extends TestCase {
context.getMockFlowExecutionContext().setKey(new MockFlowExecutionKey("c1v1"));
org.springframework.web.servlet.View mvcView = new MockView();
AbstractMvcView view = new MockMvcView(mvcView, context);
assertFalse(view.userEventQueued());
view.processUserEvent();
assertFalse(view.hasFlowEvent());
assertNull(view.getFlowEvent());
@@ -147,6 +148,7 @@ public class MvcViewTests extends TestCase {
context.getMockFlowExecutionContext().setKey(new MockFlowExecutionKey("c1v1"));
org.springframework.web.servlet.View mvcView = new MockView();
AbstractMvcView view = new MockMvcView(mvcView, context);
assertTrue(view.userEventQueued());
view.processUserEvent();
assertTrue(view.hasFlowEvent());
assertEquals("submit", view.getFlowEvent().getId());
@@ -236,6 +238,57 @@ public class MvcViewTests extends TestCase {
assertEquals("bogus 2", bm.getFieldValue("dateProperty"));
}
public void testResumeEventBindingErrorsRedirectAfterPost() throws Exception {
MockRequestControlContext context = new MockRequestControlContext();
context.putRequestParameter("_eventId", "submit");
context.putRequestParameter("integerProperty", "bogus 1");
context.putRequestParameter("dateProperty", "bogus 2");
BindBean bindBean = new BindBean();
StaticExpression modelObject = new StaticExpression(bindBean);
modelObject.setExpressionString("bindBean");
context.getCurrentState().getAttributes().put("model", modelObject);
context.getFlowScope().put("bindBean", bindBean);
context.getMockExternalContext().setNativeContext(new MockServletContext());
context.getMockExternalContext().setNativeRequest(new MockHttpServletRequest());
context.getMockExternalContext().setNativeResponse(new MockHttpServletResponse());
context.getMockFlowExecutionContext().setKey(new MockFlowExecutionKey("c1v1"));
org.springframework.web.servlet.View mvcView = new MockView();
AbstractMvcView view = new MockMvcView(mvcView, context);
view.setExpressionParser(DefaultExpressionParserFactory.getExpressionParser());
view.setMessageCodesResolver(new WebFlowMessageCodesResolver());
context.setAlwaysRedirectOnPause(true);
assertTrue(view.userEventQueued());
view.processUserEvent();
assertFalse(view.userEventQueued());
assertFalse(view.hasFlowEvent());
Object viewActionState = view.getUserEventState();
assertNotNull(viewActionState);
MockRequestControlContext context2 = new MockRequestControlContext();
context2.getFlashScope().put(org.springframework.webflow.execution.View.USER_EVENT_STATE_ATTRIBUTE,
viewActionState);
BindBean bindBean2 = new BindBean();
StaticExpression modelObject2 = new StaticExpression(bindBean2);
modelObject2.setExpressionString("bindBean");
context2.getCurrentState().getAttributes().put("model", modelObject);
context2.getFlowScope().put("bindBean", bindBean);
context2.getMockExternalContext().setNativeContext(new MockServletContext());
context2.getMockExternalContext().setNativeRequest(new MockHttpServletRequest());
context2.getMockExternalContext().setNativeResponse(new MockHttpServletResponse());
context2.getMockFlowExecutionContext().setKey(new MockFlowExecutionKey("c1v1"));
AbstractMvcView view2 = new MockMvcView(mvcView, context2);
view2.setExpressionParser(DefaultExpressionParserFactory.getExpressionParser());
view2.setMessageCodesResolver(new WebFlowMessageCodesResolver());
view2.restoreState((ViewActionStateHolder) viewActionState);
assertFalse(view2.userEventQueued());
view2.render();
assertEquals(context2.getFlowScope().get("bindBean"), model.get("bindBean"));
BindingModel bm = (BindingModel) model.get(BindingResult.MODEL_KEY_PREFIX + "bindBean");
assertNotNull(bm);
assertEquals("bogus 1", bm.getFieldValue("integerProperty"));
assertEquals("bogus 2", bm.getFieldValue("dateProperty"));
}
public void testResumeEventModelBindingAllowedFields() throws Exception {
MockRequestContext context = new MockRequestContext();
context.putRequestParameter("_eventId", "submit");
@@ -341,7 +394,9 @@ public class MvcViewTests extends TestCase {
org.springframework.web.servlet.View mvcView = new MockView();
AbstractMvcView view = new MockMvcView(mvcView, context);
view.setExpressionParser(DefaultExpressionParserFactory.getExpressionParser());
assertTrue(view.userEventQueued());
view.processUserEvent();
assertFalse(view.userEventQueued());
assertEquals(true, bindBean.getBooleanProperty());
}
@@ -363,7 +418,9 @@ public class MvcViewTests extends TestCase {
org.springframework.web.servlet.View mvcView = new MockView();
AbstractMvcView view = new MockMvcView(mvcView, context);
view.setExpressionParser(DefaultExpressionParserFactory.getExpressionParser());
assertTrue(view.userEventQueued());
view.processUserEvent();
assertFalse(view.userEventQueued());
assertTrue(view.hasFlowEvent());
assertEquals("submit", view.getFlowEvent().getId());
assertTrue(bindBean.validationMethodInvoked);
@@ -387,7 +444,9 @@ public class MvcViewTests extends TestCase {
org.springframework.web.servlet.View mvcView = new MockView();
AbstractMvcView view = new MockMvcView(mvcView, context);
view.setExpressionParser(DefaultExpressionParserFactory.getExpressionParser());
assertTrue(view.userEventQueued());
view.processUserEvent();
assertFalse(view.userEventQueued());
assertTrue(view.hasFlowEvent());
assertEquals("submit", view.getFlowEvent().getId());
assertTrue(bindBean.validationMethodInvoked);