[java-shib-idp2 COMMIT] in /branches/REL_2/src/test/java/edu/internet2/middleware/shibboleth/idp/system/conf1: SAML2S...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Feb 19 15:59:33 2013
New Revision: 3140

URL: http://svn.shibboleth.net/view/java-shib-idp2?rev=3140&view=rev
Log:
SIDP-562: Fix unit tests that were relying on the profile handlers being broken

Modified:
    branches/REL_2/src/test/java/edu/internet2/middleware/shibboleth/idp/system/conf1/SAML2SSOTestCase.java
    branches/REL_2/src/test/java/edu/internet2/middleware/shibboleth/idp/system/conf1/ShibbolethSSOTestCase.java

Modified: branches/REL_2/src/test/java/edu/internet2/middleware/shibboleth/idp/system/conf1/SAML2SSOTestCase.java
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/src/test/java/edu/internet2/middleware/shibboleth/idp/system/conf1/SAML2SSOTestCase.java?rev=3140&r1=3139&r2=3140&view=diff
==============================================================================
--- branches/REL_2/src/test/java/edu/internet2/middleware/shibboleth/idp/system/conf1/SAML2SSOTestCase.java (original)
+++ branches/REL_2/src/test/java/edu/internet2/middleware/shibboleth/idp/system/conf1/SAML2SSOTestCase.java Tue Feb 19 15:59:33 2013
@@ -43,10 +43,12 @@
 import edu.internet2.middleware.shibboleth.common.profile.ProfileHandler;
 import edu.internet2.middleware.shibboleth.common.profile.ProfileHandlerManager;
 import edu.internet2.middleware.shibboleth.common.profile.provider.AbstractShibbolethProfileHandler;
+import edu.internet2.middleware.shibboleth.common.session.SessionManager;
 import edu.internet2.middleware.shibboleth.idp.authn.LoginContext;
 import edu.internet2.middleware.shibboleth.idp.authn.Saml2LoginContext;
 import edu.internet2.middleware.shibboleth.idp.authn.UsernamePrincipal;
 import edu.internet2.middleware.shibboleth.idp.session.AuthenticationMethodInformation;
+import edu.internet2.middleware.shibboleth.idp.session.Session;
 import edu.internet2.middleware.shibboleth.idp.session.impl.AuthenticationMethodInformationImpl;
 import edu.internet2.middleware.shibboleth.idp.util.HttpServletHelper;
 
@@ -102,6 +104,14 @@
                 servletRequest, servletResponse);
         servletRequest.setCookies(servletResponse.getCookies());
 
+        // Add a fake session with a user identity to the request.
+        SessionManager sessionManager = (SessionManager) getApplicationContext().getBean("shibboleth.SessionManager");
+        Session idpSession = (Session) sessionManager.createSession();
+        Subject subject = new Subject();
+        subject.getPrincipals().add(new UsernamePrincipal("foo"));
+        idpSession.setSubject(subject);
+        servletRequest.setAttribute(Session.HTTP_SESSION_BINDING_ATTRIBUTE, idpSession);
+        
         // Process request
         HTTPInTransport profileRequest = new HttpServletRequestAdapter(servletRequest);
         HTTPOutTransport profileResponse = new HttpServletResponseAdapter(servletResponse, false);

Modified: branches/REL_2/src/test/java/edu/internet2/middleware/shibboleth/idp/system/conf1/ShibbolethSSOTestCase.java
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/src/test/java/edu/internet2/middleware/shibboleth/idp/system/conf1/ShibbolethSSOTestCase.java?rev=3140&r1=3139&r2=3140&view=diff
==============================================================================
--- branches/REL_2/src/test/java/edu/internet2/middleware/shibboleth/idp/system/conf1/ShibbolethSSOTestCase.java (original)
+++ branches/REL_2/src/test/java/edu/internet2/middleware/shibboleth/idp/system/conf1/ShibbolethSSOTestCase.java Tue Feb 19 15:59:33 2013
@@ -34,9 +34,11 @@
 import edu.internet2.middleware.shibboleth.common.profile.ProfileHandler;
 import edu.internet2.middleware.shibboleth.common.profile.ProfileHandlerManager;
 import edu.internet2.middleware.shibboleth.common.profile.provider.AbstractShibbolethProfileHandler;
+import edu.internet2.middleware.shibboleth.common.session.SessionManager;
 import edu.internet2.middleware.shibboleth.idp.authn.ShibbolethSSOLoginContext;
 import edu.internet2.middleware.shibboleth.idp.authn.UsernamePrincipal;
 import edu.internet2.middleware.shibboleth.idp.session.AuthenticationMethodInformation;
+import edu.internet2.middleware.shibboleth.idp.session.Session;
 import edu.internet2.middleware.shibboleth.idp.session.impl.AuthenticationMethodInformationImpl;
 import edu.internet2.middleware.shibboleth.idp.util.HttpServletHelper;
 
@@ -97,6 +99,14 @@
                 servletRequest, servletResponse);
         servletRequest.setCookies(servletResponse.getCookies());
 
+        // Add a fake session with a user identity to the request.
+        SessionManager sessionManager = (SessionManager) getApplicationContext().getBean("shibboleth.SessionManager");
+        Session idpSession = (Session) sessionManager.createSession();
+        Subject subject = new Subject();
+        subject.getPrincipals().add(new UsernamePrincipal("foo"));
+        idpSession.setSubject(subject);
+        servletRequest.setAttribute(Session.HTTP_SESSION_BINDING_ATTRIBUTE, idpSession);
+        
         // Process request
         HTTPInTransport profileRequest = new HttpServletRequestAdapter(servletRequest);

[... 2 lines stripped ...]