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

[noreply at shibboleth.net]

Author: putmanb
Date: Thu Nov  6 00:39:31 2014
New Revision: 4128

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4128&view=rev
Log:
Unit tests for metadatq signature validation filter, with PKIX trust engine, exercising dynamic trusted names strategy.

Added:
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SignatureValidationFilterExplicitKeyTest.java
      - copied, changed from r4126, trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SignatureValidationFilterTest.java
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SignatureValidationFilterPKIXTest.java   (with props)
    trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/metadata/resolver/filter/impl/EntityDescriptor-invalid-entityid.xml   (with props)
    trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/metadata/resolver/filter/impl/EntityDescriptor.xml   (with props)
    trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/metadata/resolver/filter/impl/ca.crt
    trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/metadata/resolver/filter/impl/ca.key
    trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/metadata/resolver/filter/impl/entity.crt
    trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/metadata/resolver/filter/impl/entity.key
    trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/metadata/resolver/filter/impl/root.crt
    trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/metadata/resolver/filter/impl/root.key
Modified:
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SignatureValidationFilterTest.java

Copied: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SignatureValidationFilterExplicitKeyTest.java (from r4126, trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SignatureValidationFilterTest.java)
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SignatureValidationFilterExplicitKeyTest.java?p2=trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SignatureValidationFilterExplicitKeyTest.java&p1=trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SignatureValidationFilterTest.java&r1=4126&r2=4128&rev=4128&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SignatureValidationFilterTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/filter/impl/SignatureValidationFilterExplicitKeyTest.java Thu Nov  6 00:39:31 2014
@@ -51,7 +51,7 @@
 /**
  * Unit tests for {@link SignatureValidationFilter}.
  */
-public class SignatureValidationFilterTest extends XMLObjectBaseTestCase {
+public class SignatureValidationFilterExplicitKeyTest extends XMLObjectBaseTestCase {
     
     private final String switchMDFileValid = "/data/org/opensaml/saml/saml2/metadata/provider/metadata.aaitest_signed.xml";
     private final String switchMDFileInvalid = "/data/org/opensaml/saml/saml2/metadata/provider/metadata.aaitest_signed.invalid.xml";
@@ -102,8 +102,8 @@
 
     @BeforeMethod
     protected void setUp() throws Exception {
-        switchMDDocumentValid = parserPool.parse(SignatureValidationFilterTest.class.getResourceAsStream(switchMDFileValid));
-        switchMDDocumentInvalid = parserPool.parse(SignatureValidationFilterTest.class.getResourceAsStream(switchMDFileInvalid));
+        switchMDDocumentValid = parserPool.parse(SignatureValidationFilterExplicitKeyTest.class.getResourceAsStream(switchMDFileValid));
+        switchMDDocumentInvalid = parserPool.parse(SignatureValidationFilterExplicitKeyTest.class.getResourceAsStream(switchMDFileInvalid));
         
         X509Certificate switchCert = X509Support.decodeCertificate(switchMDCertBase64);
         X509Credential switchCred = CredentialSupport.getSimpleCredential(switchCert, null);
@@ -160,7 +160,7 @@
         StaticCredentialResolver credResolver = new StaticCredentialResolver(cred);
         SignatureTrustEngine trustEngine = new ExplicitKeySignatureTrustEngine(credResolver, kiResolver);
         
-        Document mdDoc = parserPool.parse(SignatureValidationFilterTest.class.getResourceAsStream(openIDFileValid));
+        Document mdDoc = parserPool.parse(SignatureValidationFilterExplicitKeyTest.class.getResourceAsStream(openIDFileValid));
         XMLObject xmlObject = 
             unmarshallerFactory.getUnmarshaller(mdDoc.getDocumentElement()).unmarshall(mdDoc.getDocumentElement());
         Assert.assertTrue(xmlObject instanceof EntityDescriptor);
@@ -183,7 +183,7 @@
         StaticCredentialResolver credResolver = new StaticCredentialResolver(cred);

[... 26 lines stripped ...]