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

[noreply at shibboleth.net]

Author: tzeller
Date: Tue Jan 21 16:43:14 2014
New Revision: 121

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=121&view=rev
Log:
Wire IPAddress authentication to SAML1 flow via the "dev" profile.

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=121&r1=120&r2=121&view=diff
==============================================================================
--- trunk/src/test/java/idp/saml1/UnsolicitedFlowTest.java (original)
+++ trunk/src/test/java/idp/saml1/UnsolicitedFlowTest.java Tue Jan 21 16:43:14 2014
@@ -27,8 +27,10 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
+import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
+import org.springframework.test.context.web.WebAppConfiguration;
 import org.springframework.webflow.execution.FlowExecutionOutcome;
 import org.springframework.webflow.executor.FlowExecutionResult;
 import org.springframework.webflow.executor.FlowExecutor;
@@ -40,6 +42,8 @@
  * Stub integration test for SAML1 flow.
  */
 // TODO context hierarchies ? more annotations ?
+ at ActiveProfiles("dev")
+ at WebAppConfiguration
 @ContextConfiguration({"/system/conf/testbed-ldap.xml", "/system/conf/global-system.xml", "/conf/global-user.xml",
         "/system/conf/mvc-beans.xml", "/conf/webflow-config.xml"})
 public class UnsolicitedFlowTest extends AbstractTestNGSpringContextTests {
@@ -72,10 +76,11 @@
 
             FlowExecutionOutcome outcome = result.getOutcome();
             log.debug("flow outcome {}", outcome);
-            Assert.assertEquals(outcome.getId(), "end");            
-            
+            Assert.assertNotNull(outcome);
+            Assert.assertEquals(outcome.getId(), "end");
+
             // TODO meaningful asserts
-            
+
             Assert.assertTrue(result.isEnded());
 
         } finally {