[java-identity-provider COMMIT] in /trunk/idp-conf/src/test: java/net/shibboleth/idp/test/flows/interceptor/Intercept...

[noreply at shibboleth.net]

Author: scantor
Date: Sun Oct 26 22:53:09 2014
New Revision: 6789

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6789&view=rev
Log:
Fix unit tests for now, need to think about how to propagate custom intercept errors.

Modified:
    trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/interceptor/InterceptFlowTest.java
    trunk/idp-conf/src/test/resources/intercept/flows/test-error-flow.xml
    trunk/idp-conf/src/test/resources/intercept/flows/test-intercept-flow.xml

Modified: trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/interceptor/InterceptFlowTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/interceptor/InterceptFlowTest.java?rev=6789&r1=6788&r2=6789&view=diff
==============================================================================
--- trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/interceptor/InterceptFlowTest.java (original)
+++ trunk/idp-conf/src/test/java/net/shibboleth/idp/test/flows/interceptor/InterceptFlowTest.java Sun Oct 26 22:53:09 2014
@@ -27,6 +27,7 @@
 import net.shibboleth.idp.profile.interceptor.ProfileInterceptorFlowDescriptor;
 import net.shibboleth.idp.test.flows.AbstractFlowTest;
 
+import org.opensaml.profile.action.EventIds;
 import org.opensaml.profile.context.ProfileRequestContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -163,7 +164,7 @@
         final FlowExecutionResult result = flowExecutor.launchExecution(TEST_PROFILE_FLOW_ID, null, externalContext);
 
         assertFlowExecutionResult(result, TEST_PROFILE_FLOW_ID);
-        assertFlowExecutionOutcome(result.getOutcome(), "HandleError");
+        assertFlowExecutionOutcome(result.getOutcome(), EventIds.INVALID_PROFILE_CTX);
 
         final ProfileRequestContext prc = retrieveProfileRequestContext(result);
         Assert.assertNotNull(prc);
@@ -193,7 +194,7 @@
         final FlowExecutionResult result = flowExecutor.launchExecution(TEST_PROFILE_FLOW_ID, null, externalContext);
 
         assertFlowExecutionResult(result, TEST_PROFILE_FLOW_ID);
-        assertFlowExecutionOutcome(result.getOutcome(), "HandleError");
+        assertFlowExecutionOutcome(result.getOutcome(), EventIds.INVALID_PROFILE_CTX);
 
         final ProfileRequestContext prc = retrieveProfileRequestContext(result);
         Assert.assertNotNull(prc);

Modified: trunk/idp-conf/src/test/resources/intercept/flows/test-error-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/resources/intercept/flows/test-error-flow.xml?rev=6789&r1=6788&r2=6789&view=diff
==============================================================================
--- trunk/idp-conf/src/test/resources/intercept/flows/test-error-flow.xml (original)
+++ trunk/idp-conf/src/test/resources/intercept/flows/test-error-flow.xml Sun Oct 26 22:53:09 2014
@@ -2,6 +2,6 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.springframework.org/schema/webflow http://www.springframework.org/schema/webflow/spring-webflow.xsd">
 
-    <end-state id="FlowError" />
+    <end-state id="InvalidProfileContext" />
 
 </flow>

Modified: trunk/idp-conf/src/test/resources/intercept/flows/test-intercept-flow.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/test/resources/intercept/flows/test-intercept-flow.xml?rev=6789&r1=6788&r2=6789&view=diff
==============================================================================
--- trunk/idp-conf/src/test/resources/intercept/flows/test-intercept-flow.xml (original)
+++ trunk/idp-conf/src/test/resources/intercept/flows/test-intercept-flow.xml Sun Oct 26 22:53:09 2014
@@ -20,7 +20,7 @@
         <output name="testProceed2" value="conversationScope.testProceed2" />
     </end-state>
 
-    <end-state id="HandleError">
+    <end-state id="InvalidProfileContext">
         <output name="ProfileRequestContext" value="opensamlProfileRequestContext" />
         <output name="testProceed1" value="conversationScope.testProceed1" />
         <output name="testProceed2" value="conversationScope.testProceed2" />