[java-idp-testbed COMMIT] /trunk/src/test/java/idp/saml1/UnsolicitedFlowTest.java

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Jan 21 14:43:29 2014
New Revision: 119

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=119&view=rev
Log:
More work on SAML1 flow. Experimenting with preferring c-namespace and p-namespace as well as XML new-line-per-attribute formatting.

Modified:
    trunk/src/test/java/idp/saml1/UnsolicitedFlowTest.java

Modified: trunk/src/test/java/idp/saml1/UnsolicitedFlowTest.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/java/idp/saml1/UnsolicitedFlowTest.java?rev=119&r1=118&r2=119&view=diff
==============================================================================
--- trunk/src/test/java/idp/saml1/UnsolicitedFlowTest.java (original)
+++ trunk/src/test/java/idp/saml1/UnsolicitedFlowTest.java Tue Jan 21 14:43:29 2014
@@ -17,6 +17,7 @@
 
 package idp.saml1;
 
+import javax.annotation.Nonnull;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -28,6 +29,7 @@
 import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
+import org.springframework.webflow.execution.FlowExecutionOutcome;
 import org.springframework.webflow.executor.FlowExecutionResult;
 import org.springframework.webflow.executor.FlowExecutor;
 import org.springframework.webflow.test.MockExternalContext;
@@ -42,8 +44,11 @@
         "/system/conf/mvc-beans.xml", "/conf/webflow-config.xml"})
 public class UnsolicitedFlowTest extends AbstractTestNGSpringContextTests {
 
+    /** Flow id. */
+    @Nonnull public final static String flowId = "Shibboleth/SSO";
+
     /** Class logger. */
-    private final Logger log = LoggerFactory.getLogger(UnsolicitedFlowTest.class);
+    @Nonnull private final Logger log = LoggerFactory.getLogger(UnsolicitedFlowTest.class);
 
     @Test public void testFlow() {
         try {
@@ -62,10 +67,15 @@
 
             FlowExecutor flowExecutor = applicationContext.getBean("flowExecutor", FlowExecutor.class);
 
-            FlowExecutionResult result = flowExecutor.launchExecution("Shibboleth/SSO", null, mockCtx);
-            log.debug("flow result {}", result);
+            FlowExecutionResult result = flowExecutor.launchExecution(flowId, null, mockCtx);
+            Assert.assertEquals(result.getFlowId(), flowId);
 
+            FlowExecutionOutcome outcome = result.getOutcome();
+            log.debug("flow outcome {}", outcome);
+            Assert.assertEquals(outcome.getId(), "end");            
+            
             // TODO meaningful asserts
+            
             Assert.assertTrue(result.isEnded());
 
         } finally {