[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding: encoding/HTTPPostS...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Jan 23 19:02:11 2013
New Revision: 3163

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3163&view=rev
Log:
Fix test that uses an encoder to setup control data.

Modified:
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/HTTPPostSimpleSignEncoderTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/SAML2HTTPPostSimpleSignSecurityPolicyRuleTest.java

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/HTTPPostSimpleSignEncoderTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/HTTPPostSimpleSignEncoderTest.java?rev=3163&r1=3162&r2=3163&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/HTTPPostSimpleSignEncoderTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/encoding/HTTPPostSimpleSignEncoderTest.java Wed Jan 23 19:02:11 2013
@@ -185,8 +185,8 @@
         messageContext.getSubcontext(SamlProtocolContext.class, true).setRelayState("relay");
         messageContext.getSubcontext(SamlPeerEntityContext.class, true)
             .getSubcontext(SamlEndpointContext.class, true).setEndpoint(samlEndpoint);
+        
         KeyPair kp = KeySupport.generateKeyPair("RSA", 1024, null);
-        
         MockSignatureSigningConfiguration mockSigningConfig = new MockSignatureSigningConfiguration();
         mockSigningConfig.setSigningCredential(CredentialSupport.getSimpleCredential(kp.getPublic(), kp.getPrivate()));
         messageContext.getSubcontext(SamlSigningContext.class, true).setSigningConfiguration(mockSigningConfig);

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/SAML2HTTPPostSimpleSignSecurityPolicyRuleTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/SAML2HTTPPostSimpleSignSecurityPolicyRuleTest.java?rev=3163&r1=3162&r2=3163&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/SAML2HTTPPostSimpleSignSecurityPolicyRuleTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/SAML2HTTPPostSimpleSignSecurityPolicyRuleTest.java Wed Jan 23 19:02:11 2013
@@ -37,7 +37,10 @@
 import org.opensaml.saml.common.SAMLTestHelper;
 import org.opensaml.saml.common.binding.SAMLMessageContext;
 import org.opensaml.saml.common.binding.security.BaseSAMLSecurityPolicyRuleTestCase;
+import org.opensaml.saml.common.context.SamlEndpointContext;
+import org.opensaml.saml.common.context.SamlPeerEntityContext;
 import org.opensaml.saml.common.context.SamlProtocolContext;
+import org.opensaml.saml.common.context.SamlSigningContext;
 import org.opensaml.saml.saml2.binding.encoding.HTTPPostSimpleSignEncoder;
 import org.opensaml.saml.saml2.core.AuthnRequest;
 import org.opensaml.saml.saml2.core.NameID;
@@ -46,6 +49,7 @@
 import org.opensaml.saml.saml2.metadata.Endpoint;
 import org.opensaml.saml.saml2.metadata.SPSSODescriptor;
 import org.opensaml.security.credential.Credential;
+import org.opensaml.security.credential.CredentialSupport;
 import org.opensaml.security.credential.impl.CollectionCredentialResolver;
 import org.opensaml.security.crypto.KeySupport;
 import org.opensaml.security.x509.BasicX509Credential;
@@ -54,6 +58,7 @@
 import org.opensaml.ws.transport.http.HTTPInTransport;
 import org.opensaml.ws.transport.http.HttpServletRequestAdapter;
 import org.opensaml.xmlsec.keyinfo.KeyInfoCredentialResolver;
+import org.opensaml.xmlsec.mock.MockSignatureSigningConfiguration;
 import org.opensaml.xmlsec.signature.support.SignatureTrustEngine;
 import org.opensaml.xmlsec.signature.support.impl.ExplicitKeySignatureTrustEngine;
 import org.springframework.mock.web.MockHttpServletRequest;
@@ -303,9 +308,12 @@
         MessageContext<SAMLObject> messageContext = new MessageContext<SAMLObject>();
         messageContext.setMessage(buildInboundSAMLMessage());
         messageContext.getSubcontext(SamlProtocolContext.class, true).setRelayState(expectedRelayValue);
-        //TODO
-        //messageContext.setPeerEntityEndpoint(samlEndpoint);
-        //messageContext.setOutboundSAMLMessageSigningCredential(signingX509Cred);
+        messageContext.getSubcontext(SamlPeerEntityContext.class, true)
+            .getSubcontext(SamlEndpointContext.class, true).setEndpoint(samlEndpoint);
+        
+        MockSignatureSigningConfiguration mockSigningConfig = new MockSignatureSigningConfiguration();
+        mockSigningConfig.setSigningCredential(signingX509Cred);
+        messageContext.getSubcontext(SamlSigningContext.class, true).setSigningConfiguration(mockSigningConfig);
         
         MockHttpServletResponse response = new MockHttpServletResponse();