[java-identity-provider COMMIT] in /trunk/idp-saml-impl/src: main/java/net/shibboleth/idp/saml/impl/profile/saml2/Set...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jul 16 14:00:35 2013
New Revision: 4584

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4584&view=rev
Log:
Fix failing tests.

Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/SetRequestedAuthenticationWorkflows.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAuthenticationStatementToAssertionTest.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/SetRequestedAuthenticationWorkflows.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/SetRequestedAuthenticationWorkflows.java?rev=4584&r1=4583&r2=4584&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/SetRequestedAuthenticationWorkflows.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml2/SetRequestedAuthenticationWorkflows.java Tue Jul 16 14:00:35 2013
@@ -29,13 +29,12 @@
 import net.shibboleth.ext.spring.webflow.Events;
 import net.shibboleth.idp.authn.AbstractAuthenticationAction;
 import net.shibboleth.idp.authn.AuthenticationException;
-import net.shibboleth.idp.authn.AuthenticationRequestContext;
 import net.shibboleth.idp.authn.AuthenticationWorkflowDescriptor;
+import net.shibboleth.idp.authn.context.AuthenticationContext;
 import net.shibboleth.idp.profile.ActionSupport;
 
 import org.opensaml.profile.action.EventIds;
 import org.opensaml.profile.context.ProfileRequestContext;
-
 import org.opensaml.messaging.context.MessageContext;
 import org.opensaml.saml.saml2.core.AuthnContextClassRef;
 import org.opensaml.saml.saml2.core.AuthnContextDeclRef;
@@ -59,7 +58,7 @@
     /** {@inheritDoc} */
     protected org.springframework.webflow.execution.Event doExecute(@Nonnull final RequestContext springRequestContext,
             @Nonnull final ProfileRequestContext profileRequestContext,
-            @Nonnull final AuthenticationRequestContext authenticationContext) throws AuthenticationException {
+            @Nonnull final AuthenticationContext authenticationContext) throws AuthenticationException {
 
         final AuthnRequest authnRequest = getAuthnRequest(profileRequestContext);
         if (authnRequest == null) {

Modified: trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAuthenticationStatementToAssertionTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAuthenticationStatementToAssertionTest.java?rev=4584&r1=4583&r2=4584&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAuthenticationStatementToAssertionTest.java (original)
+++ trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddAuthenticationStatementToAssertionTest.java Tue Jul 16 14:00:35 2013
@@ -17,8 +17,8 @@
 
 package net.shibboleth.idp.saml.impl.profile.saml1;
 
-import net.shibboleth.idp.authn.AuthenticationRequestContext;
 import net.shibboleth.idp.authn.AuthenticationWorkflowDescriptor;
+import net.shibboleth.idp.authn.context.AuthenticationContext;
 import net.shibboleth.idp.profile.ActionTestingSupport;
 
 import org.opensaml.profile.action.EventIds;
@@ -92,7 +92,7 @@
                 new RequestContextBuilder().setOutboundMessage(Saml1ActionTestingSupport.buildResponse())
                         .buildProfileRequestContext();
 
-        AuthenticationRequestContext authCtx = new AuthenticationRequestContext(null, null);
+        AuthenticationContext authCtx = new AuthenticationContext(null);
         profileCtx.addSubcontext(authCtx);
 
         AddAuthenticationStatementToAssertion action = new AddAuthenticationStatementToAssertion();
@@ -102,7 +102,7 @@
         try {
             action.doExecute(new MockRequestContext(), profileCtx);
             Assert.fail();
-        } catch (IllegalStateException e) {
+        } catch (NullPointerException e) {
             // ok
         }
     }
@@ -113,7 +113,7 @@
                 new RequestContextBuilder().setOutboundMessage(Saml1ActionTestingSupport.buildResponse())
                         .buildProfileRequestContext();
 
-        AuthenticationRequestContext authCtx = new AuthenticationRequestContext(null, null);
+        AuthenticationContext authCtx = new AuthenticationContext(null);
         authCtx.setAttemptedWorkflow(new AuthenticationWorkflowDescriptor("test"));
 
         long now = System.currentTimeMillis();