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

fixed 2 failing tests

Browse Source
This commit is contained in:
Keith Donald
2008-03-20 06:02:31 +00:00
parent 52e75c2d9e
commit e57e4c20ab
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-webflow/src/main/java/org/springframework/webflow/mvc/MvcView.java
View File

@@ -39,8 +39,6 @@ import org.springframework.binding.mapping.impl.DefaultMapping;
import org.springframework.binding.mapping.results.TargetAccessError;
import org.springframework.validation.BindingResult;
import org.springframework.webflow.core.collection.ParameterMap;
import org.springframework.webflow.engine.Transition;
import org.springframework.webflow.engine.TransitionableState;
import org.springframework.webflow.execution.Event;
import org.springframework.webflow.execution.RequestContext;
import org.springframework.webflow.execution.View;
@@ -166,14 +164,15 @@ class MvcView implements View {
private boolean shouldBind(Object model) {
// this downcast is not ideal
TransitionableState currentState = (TransitionableState) context.getCurrentState();
// TransitionableState currentState = (TransitionableState) context.getCurrentState();
// TODO this won't work because last event isn't set yet...
Transition transition = currentState.getRequiredTransition(context);
if (transition.getAttributes().contains("bind")) {
return transition.getAttributes().getBoolean("bind").booleanValue();
} else {
return false;
}
// Transition transition = currentState.getRequiredTransition(context);
// if (transition.getAttributes().contains("bind")) {
// return transition.getAttributes().getBoolean("bind").booleanValue();
// } else {
// return false;
// }
return false;
}
private MappingResults bind(Object model) {

2
spring-webflow/src/test/java/org/springframework/webflow/mvc/MvcViewFactoryTests.java
View File

@@ -108,6 +108,7 @@ public class MvcViewFactoryTests extends TestCase {
context.setExternalContext(externalContext);
context.getMockFlowExecutionContext().setKey(new GeneratedFlowExecutionKey());
View view = viewFactory.getView(context);
view.postback();
assertEquals(true, view.eventSignaled());
Event e = view.getEvent();
assertEquals(view, e.getSource());
@@ -139,6 +140,7 @@ public class MvcViewFactoryTests extends TestCase {
context.setExternalContext(externalContext);
context.getMockFlowExecutionContext().setKey(new GeneratedFlowExecutionKey());
View view = viewFactory.getView(context);
view.postback();
assertEquals(true, view.eventSignaled());
Event e = view.getEvent();
assertEquals(view, e.getSource());