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

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Mar 26 20:51:02 2014
New Revision: 3738

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3738&view=rev
Log:
Change control metadata file back to be valid signed file, we may want to use for signature validation tests, etc.
Fix failing test just be setting requireValidMetadata to false. (Related NPE in abstract base resovler class pending).  

Modified:
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ChainingMetadataResolverTest.java
    trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/saml2/metadata/metadata.switchaai_signed.xml

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ChainingMetadataResolverTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ChainingMetadataResolverTest.java?rev=3738&r1=3737&r2=3738&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ChainingMetadataResolverTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml/metadata/resolver/impl/ChainingMetadataResolverTest.java Wed Mar 26 20:51:02 2014
@@ -65,6 +65,8 @@
         File mdFile2 = new File(mdURL2.toURI());
         FilesystemMetadataResolver fileProvider2 = new FilesystemMetadataResolver(mdFile2);
         fileProvider2.setParserPool(parserPool);
+        // For this test, need to set this because metadata.switchaai_signed.xml has an expired validUntil
+        fileProvider2.setRequireValidMetadata(false);
         fileProvider2.initialize();
         resolvers.add(fileProvider2);
         

Modified: trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/saml2/metadata/metadata.switchaai_signed.xml
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/saml2/metadata/metadata.switchaai_signed.xml?rev=3738&r1=3737&r2=3738&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/saml2/metadata/metadata.switchaai_signed.xml (original)
+++ trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/saml2/metadata/metadata.switchaai_signed.xml Wed Mar 26 20:51:02 2014
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="urn:mace:switch.ch:SWITCHaai" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-<!--  NOTE the signature on this file is now invalid -->
+<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="urn:mace:switch.ch:SWITCHaai" validUntil="2010-01-01T00:00:00Z" xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata saml-schema-metadata-2.0.xsd urn:mace:shibboleth:metadata:1.0 shibboleth-metadata-1.0.xsd http://www.w3.org/2000/09/xmldsig# xmldsig-core-schema.xsd"><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
 <ds:SignedInfo>
 <ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#WithComments"/>
 <ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>