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

[noreply at shibboleth.net]

Author: scantor
Date: Mon Mar  3 12:05:09 2014
New Revision: 5512

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5512&view=rev
Log:
IDP-355 - refactor into OpenSAML using lookup functions

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/config/logic/DetailedErrorsProfileConfigPredicate.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/navigate/
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/navigate/SpringStatusMessageLookupFunction.java   (with props)
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/navigate/package-info.java   (with props)
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/navigate/
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/navigate/SpringStatusMessageLookupFunctionTest.java
      - copied, changed from r5511, trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddStatusToResponseTest.java
Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/profile/saml1/AddStatusToResponse.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddStatusToResponseTest.java

Copied: trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/navigate/SpringStatusMessageLookupFunctionTest.java (from r5511, trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddStatusToResponseTest.java)
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/navigate/SpringStatusMessageLookupFunctionTest.java?p2=trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/navigate/SpringStatusMessageLookupFunctionTest.java&p1=trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddStatusToResponseTest.java&r1=5511&r2=5512&rev=5512&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/saml1/AddStatusToResponseTest.java (original)
+++ trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/profile/navigate/SpringStatusMessageLookupFunctionTest.java Mon Mar  3 12:05:09 2014
@@ -15,28 +15,18 @@
  * limitations under the License.
  */
 
-package net.shibboleth.idp.saml.impl.profile.saml1;
+package net.shibboleth.idp.saml.impl.profile.navigate;
 
 import java.util.Locale;
 
 import org.opensaml.profile.ProfileException;
-import org.opensaml.profile.action.ActionTestingSupport;
 import org.opensaml.profile.context.ProfileRequestContext;
 
 import net.shibboleth.idp.profile.RequestContextBuilder;
-import net.shibboleth.idp.profile.config.SecurityConfiguration;
-import net.shibboleth.idp.profile.context.RelyingPartyContext;
-import net.shibboleth.idp.relyingparty.RelyingPartyConfiguration;
-import net.shibboleth.idp.saml.impl.profile.config.navigate.IdentifierGenerationStrategyLookupFunction;
-import net.shibboleth.idp.saml.profile.config.saml1.BrowserSSOProfileConfiguration;
+import net.shibboleth.idp.profile.context.SpringRequestContext;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 
 import org.opensaml.core.OpenSAMLInitBaseTestCase;
-import org.opensaml.messaging.context.MessageContext;
-import org.opensaml.saml.saml1.core.Response;
-import org.opensaml.saml.saml1.core.Status;
-import org.opensaml.saml.saml1.core.StatusCode;
-import org.opensaml.saml.saml1.profile.impl.AddResponseShell;
 import org.springframework.context.MessageSource;
 import org.springframework.context.MessageSourceResolvable;
 import org.springframework.context.NoSuchMessageException;
@@ -46,137 +36,32 @@
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-import com.google.common.collect.Lists;
+/** {@link SpringStatusMessageLookupFunction} unit test. */
+public class SpringStatusMessageLookupFunctionTest extends OpenSAMLInitBaseTestCase {
 
-/** {@link AddStatusToResponse} unit test. */
-public class AddStatusToResponseTest extends OpenSAMLInitBaseTestCase {
-
-    private MockRequestContext springRequestContext; 
+    private MockRequestContext springRequestContext;
     
-    private ProfileRequestContext<Object,Response> prc;
-    
-    private AddResponseShell addResponse;
-    
-    private AddStatusToResponse action;
+    private ProfileRequestContext prc;
     
     @BeforeMethod public void setUp() throws ComponentInitializationException, ProfileException {
         springRequestContext = (MockRequestContext) new RequestContextBuilder().buildRequestContext();
         prc = (ProfileRequestContext) springRequestContext.getConversationScope().get(ProfileRequestContext.BINDING_KEY);
-        
-        final BrowserSSOProfileConfiguration profileConfig = new BrowserSSOProfileConfiguration();
-        profileConfig.setSecurityConfiguration(new SecurityConfiguration());
-        prc.setOutboundMessageContext(new MessageContext<Response>());

[... 123 lines stripped ...]