fixed small bugs in tests

krimple · Feb 25, 2012 · 82add3e · 82add3e
1 parent 4cfed58
commit 82add3e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 17 deletions.
diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
@@ -12,4 +12,5 @@ log4j.logger.org.springframework.web.servlet.handler=DEBUG
 log4j.appender.stdout.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.R=org.apache.log4j.RollingFileAppender
-log4j.logger.com.chariot.games=trace
+log4j.logger.com.chariot.games=trace
+log4j.logger.org.springframework.webflow=trace
diff --git a/src/test/java/com/chariot/games/quizzo/web/flow/QuizzoFlowTest.java b/src/test/java/com/chariot/games/quizzo/web/flow/QuizzoFlowTest.java
@@ -8,14 +8,11 @@
 import org.springframework.webflow.core.collection.MutableAttributeMap;
 import org.springframework.webflow.test.MockExternalContext;
 import org.springframework.webflow.test.MockFlowBuilderContext;
-import org.springframework.webflow.test.MockRequestContext;
 import org.springframework.webflow.test.execution.AbstractXmlFlowExecutionTests;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.mockito.Mockito.*;
-
 public class QuizzoFlowTest extends AbstractXmlFlowExecutionTests {
 
   @Override
@@ -42,16 +39,10 @@ public void testStartFlow() {
   @Test
   public void testSubmitTeamName() {
     setCurrentState("register-team");
-    QuizzoFlowManager quizzoFlowManager = mock(QuizzoFlowManager.class);
     MockExternalContext context = new MockExternalContext();
-    MutableAttributeMap map = new LocalAttributeMap();
-
-    MockFlowBuilderContext flowBuilderContext = new MockFlowBuilderContext("playQuizzo", map);
     getFlowScope().put("teamSetupForm",
         createTeamSetupForm("The Jets", "When you're a Jet you're a Jet"));
 
-    flowBuilderContext.registerBean("quizzoFlowManager", quizzoFlowManager);
-//    configureFlowBuilderContext(flowBuilderContext);
     context.setEventId("continue");
     resumeFlow(context);
     assertCurrentStateEquals("register-team-members");
@@ -60,21 +51,16 @@ public void testSubmitTeamName() {
   @Test
   public void testSubmitTeamMembers() {
     setCurrentState("register-team-members");
-    QuizzoFlowManager quizzoFlowManager = mock(QuizzoFlowManager.class);
-    MockExternalContext context = new MockExternalContext();
-    MutableAttributeMap map = new LocalAttributeMap();
 
-    MockFlowBuilderContext flowBuilderContext = new MockFlowBuilderContext("playQuizzo", map);
+    MockExternalContext context = new MockExternalContext();
     getFlowScope().put("teamSetupForm",
         createTeamSetupForm("The Jets",
                 "When you're a Jet you're a Jet",
         "Ice", "Action", "Baby John", "Tiger", "Joyboy"));
 
-    flowBuilderContext.registerBean("quizzoFlowManager", quizzoFlowManager);
-    MockRequestContext requestContext = new MockRequestContext();
     context.setEventId("continue");
     resumeFlow(context);
-
+    assertCurrentStateEquals("play-round");
   }
 
   @Test