From da9bb142e9bccac4d8545362450437a315096684 Mon Sep 17 00:00:00 2001 From: Keith Donald Date: Fri, 17 Apr 2009 15:47:34 +0000 Subject: [PATCH] testing --- .../engine/model/ActionStateModelTests.java | 12 +++- .../engine/model/DecisionStateModelTests.java | 8 +++ .../engine/model/EndStateModelTests.java | 10 +++- .../engine/model/SubflowStateModelTests.java | 3 +- .../engine/model/ViewStateModelTests.java | 57 ++++++++++++++++++- 5 files changed, 85 insertions(+), 5 deletions(-) diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/ActionStateModelTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/ActionStateModelTests.java index b313ca96..5a1345ae 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/ActionStateModelTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/ActionStateModelTests.java @@ -15,6 +15,8 @@ */ package org.springframework.webflow.engine.model; +import java.util.LinkedList; + import junit.framework.TestCase; /** @@ -40,10 +42,18 @@ public class ActionStateModelTests extends TestCase { public void testMerge() { ActionStateModel child = new ActionStateModel("child"); - ActionStateModel parent = new ActionStateModel("child"); + ActionStateModel parent = new ActionStateModel("parent"); + + LinkedList actions = new LinkedList(); + EvaluateModel eval = new EvaluateModel("foo.bar"); + actions.add(eval); + parent.setActions(actions); + parent.setSecured(new SecuredModel("secured")); child.merge(parent); + assertNotNull(child.getSecured()); + assertEquals("foo.bar", ((EvaluateModel) child.getActions().get(0)).getExpression()); } } diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/DecisionStateModelTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/DecisionStateModelTests.java index f6b80cca..c80dee80 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/DecisionStateModelTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/DecisionStateModelTests.java @@ -15,6 +15,8 @@ */ package org.springframework.webflow.engine.model; +import java.util.LinkedList; + import junit.framework.TestCase; /** @@ -42,8 +44,14 @@ public class DecisionStateModelTests extends TestCase { DecisionStateModel child = new DecisionStateModel("child"); DecisionStateModel parent = new DecisionStateModel("child"); parent.setSecured(new SecuredModel("secured")); + + LinkedList ifs = new LinkedList(); + ifs.add(new IfModel("test", "foo")); + parent.setIfs(ifs); + child.merge(parent); assertNotNull(child.getSecured()); + assertNotNull("test", ((IfModel) child.getIfs().get(0)).getTest()); } } diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/EndStateModelTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/EndStateModelTests.java index 139de6ce..33923ec0 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/EndStateModelTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/EndStateModelTests.java @@ -15,6 +15,8 @@ */ package org.springframework.webflow.engine.model; +import java.util.LinkedList; + import junit.framework.TestCase; /** @@ -42,8 +44,14 @@ public class EndStateModelTests extends TestCase { EndStateModel child = new EndStateModel("child"); EndStateModel parent = new EndStateModel("child"); parent.setCommit("true"); + parent.setView("view"); + + LinkedList outputs = new LinkedList(); + outputs.add(new OutputModel("foo", "bar")); + parent.setOutputs(outputs); + child.merge(parent); assertEquals("true", child.getCommit()); + assertEquals("bar", ((OutputModel) child.getOutputs().get(0)).getValue()); } - } diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/SubflowStateModelTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/SubflowStateModelTests.java index 306ad19b..74ccb734 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/SubflowStateModelTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/SubflowStateModelTests.java @@ -39,10 +39,11 @@ public class SubflowStateModelTests extends TestCase { } public void testMerge() { - SubflowStateModel child = new SubflowStateModel("child", "flow"); + SubflowStateModel child = new SubflowStateModel("child", null); SubflowStateModel parent = new SubflowStateModel("child", "flow"); parent.setSecured(new SecuredModel("secured")); child.merge(parent); + assertEquals("flow", child.getSubflow()); assertNotNull(child.getSecured()); } diff --git a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/ViewStateModelTests.java b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/ViewStateModelTests.java index 77de21ad..22aefae4 100644 --- a/spring-webflow/src/test/java/org/springframework/webflow/engine/model/ViewStateModelTests.java +++ b/spring-webflow/src/test/java/org/springframework/webflow/engine/model/ViewStateModelTests.java @@ -15,6 +15,8 @@ */ package org.springframework.webflow.engine.model; +import java.util.LinkedList; + import junit.framework.TestCase; /** @@ -40,10 +42,61 @@ public class ViewStateModelTests extends TestCase { public void testMerge() { ViewStateModel child = new ViewStateModel("child"); - ViewStateModel parent = new ViewStateModel("child"); + ViewStateModel parent = new ViewStateModel("parent"); + + LinkedList attributes = new LinkedList(); + attributes.add(new AttributeModel("foo", "bar")); + parent.setAttributes(attributes); + + BinderModel binder = new BinderModel(); + LinkedList bindings = new LinkedList(); + bindings.add(new BindingModel("foo", "fooConverter", "true")); + binder.setBindings(bindings); + parent.setBinder(binder); + parent.setSecured(new SecuredModel("secured")); + + parent.setRedirect("true"); + parent.setPopup("true"); + parent.setModel("fooModel"); + parent.setView("fooView"); + + LinkedList transitions = new LinkedList(); + TransitionModel tx = new TransitionModel(); + tx.setOn("submit"); + tx.setTo("bar"); + transitions.add(tx); + parent.setTransitions(transitions); + + EvaluateModel eval = new EvaluateModel("foo.bar"); + LinkedList actions = new LinkedList(); + actions.add(eval); + parent.setOnEntryActions(actions); + parent.setOnExitActions(actions); + parent.setOnRenderActions(actions); + + LinkedList vars = new LinkedList(); + vars.add(new VarModel("foo", "class")); + parent.setVars(vars); + + LinkedList eh = new LinkedList(); + eh.add(new ExceptionHandlerModel("foo")); + parent.setExceptionHandlers(eh); + child.merge(parent); assertNotNull(child.getSecured()); - } + assertEquals("true", child.getRedirect()); + assertEquals("true", child.getPopup()); + assertEquals("fooModel", child.getModel()); + assertEquals("fooView", child.getView()); + assertEquals("bar", ((AttributeModel) child.getAttributes().get(0)).getValue()); + assertEquals("foo", ((BindingModel) child.getBinder().getBindings().get(0)).getProperty()); + assertEquals("bar", ((TransitionModel) child.getTransitions().get(0)).getTo()); + assertEquals("foo.bar", ((EvaluateModel) child.getOnEntryActions().get(0)).getExpression()); + assertEquals("foo.bar", ((EvaluateModel) child.getOnExitActions().get(0)).getExpression()); + assertEquals("foo.bar", ((EvaluateModel) child.getOnRenderActions().get(0)).getExpression()); + assertEquals("foo", ((VarModel) child.getVars().get(0)).getName()); + assertEquals("foo", ((ExceptionHandlerModel) child.getExceptionHandlers().get(0)).getBean()); + } }