[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml: common/binding/security/SAMLProt...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Jan 23 19:59:33 2013
New Revision: 3164

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3164&view=rev
Log:
Fix another couple of randomly broken unit tests due to API changes.

Modified:
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/SAMLProtocolMessageXMLSignatureSecurityPolicyRuleTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/SAML2HTTPRedirectDeflateSignatureSecurityPolicyRuleTest.java

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/SAMLProtocolMessageXMLSignatureSecurityPolicyRuleTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/SAMLProtocolMessageXMLSignatureSecurityPolicyRuleTest.java?rev=3164&r1=3163&r2=3164&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/SAMLProtocolMessageXMLSignatureSecurityPolicyRuleTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/common/binding/security/SAMLProtocolMessageXMLSignatureSecurityPolicyRuleTest.java Wed Jan 23 19:59:33 2013
@@ -118,7 +118,7 @@
         signingCert = X509Support.decodeCertificate(signingCertBase64);
         //signingPrivateKey = SecurityTestHelper.buildJavaRSAPrivateKey(signingPrivateKeyBase64);
         
-        signingX509Cred = new BasicX509Credential(signingCert, signingPrivateKey);
+        signingX509Cred = new BasicX509Credential(signingCert);
         signingX509Cred.setEntityId(issuer);
         
         otherCert1 = X509Support.decodeCertificate(otherCert1Base64);

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/SAML2HTTPRedirectDeflateSignatureSecurityPolicyRuleTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/SAML2HTTPRedirectDeflateSignatureSecurityPolicyRuleTest.java?rev=3164&r1=3163&r2=3164&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/SAML2HTTPRedirectDeflateSignatureSecurityPolicyRuleTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/saml2/binding/security/SAML2HTTPRedirectDeflateSignatureSecurityPolicyRuleTest.java Wed Jan 23 19:59:33 2013
@@ -36,7 +36,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.HTTPRedirectDeflateEncoder;
 import org.opensaml.saml.saml2.core.AuthnRequest;
 import org.opensaml.saml.saml2.core.NameID;
@@ -53,6 +56,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;
@@ -265,9 +269,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();