[java-opensaml COMMIT] /trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/Signat...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Nov  7 11:27:52 2014
New Revision: 4129

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4129&view=rev
Log:
Test cleanups.

Modified:
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SignatureValidationFilterPKIXTest.java

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SignatureValidationFilterPKIXTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SignatureValidationFilterPKIXTest.java?rev=4129&r1=4128&r2=4129&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SignatureValidationFilterPKIXTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SignatureValidationFilterPKIXTest.java Fri Nov  7 11:27:52 2014
@@ -93,6 +93,7 @@
 
     private XMLObject generateSignedMetadata(Credential signingCredential, String unsignedMetadata) 
             throws SecurityException, SignatureException, MarshallingException, UnmarshallingException {
+        
         XMLObject unsignedObject = unmarshallElement(DATA_PATH + unsignedMetadata);
         if (!(unsignedObject instanceof SignableSAMLObject)) {
             Assert.fail("Not a signable SAML object");
@@ -108,8 +109,6 @@
         kigf.setEmitEntityCertificate(true);
         kigf.setEmitEntityCertificateChain(true);
         kigf.setEmitX509SubjectName(true);
-        kigf.setEmitX509SKI(false);
-        kigf.setEmitX509IssuerSerial(false);
         params.setKeyInfoGenerator(kigf.newInstance());
         
         Signature signature = buildXMLObject(Signature.DEFAULT_ELEMENT_NAME);
@@ -121,8 +120,9 @@
         
         Signer.signObject(signature);
         
-        System.out.println(SerializeSupport.prettyPrintXML(dom));
-        
+        //System.out.println(SerializeSupport.prettyPrintXML(dom));
+        
+        // Unmarshall a new tree around the signed DOM to avoid any XMLSignature weirdness
         return unmarshallerFactory.getUnmarshaller(dom).unmarshall(dom);
     }