[java-opensaml COMMIT] in /trunk/opensaml-saml-impl/src/test: java/org/opensaml/saml2/metadata/provider/ResourceBacke...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Mar 23 18:33:59 2012
New Revision: 2958

URL: http://svn.shibboleth.net/view/java-opensaml?rev=2958&view=rev
Log:
Fix some unit tests failing due to recent refactorings.

Modified:
    trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml2/metadata/provider/ResourceBackedMetadataProviderTest.java
    trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml1/impl/AttributeWithChildren.xml
    trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml2/core/ResponseSuccessAuthnAttrib.xml
    trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml2/encryption/Assertion.xml
    trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml2/encryption/Attribute.xml

Modified: trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml2/metadata/provider/ResourceBackedMetadataProviderTest.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml2/metadata/provider/ResourceBackedMetadataProviderTest.java?rev=2958&r1=2957&r2=2958&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml2/metadata/provider/ResourceBackedMetadataProviderTest.java (original)
+++ trunk/opensaml-saml-impl/src/test/java/org/opensaml/saml2/metadata/provider/ResourceBackedMetadataProviderTest.java Fri Mar 23 18:33:59 2012
@@ -48,6 +48,7 @@
         URL mdURL = ResourceBackedMetadataProviderTest.class
                 .getResource("/data/org/opensaml/saml2/metadata/InCommon-metadata.xml");
         FilesystemResource mdResource = new FilesystemResource(new File(mdURL.toURI()).getAbsolutePath());
+        mdResource.initialize();
 
         metadataProvider = new ResourceBackedMetadataProvider(new Timer(), mdResource);
         metadataProvider.setParserPool(parser);

Modified: trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml1/impl/AttributeWithChildren.xml
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml1/impl/AttributeWithChildren.xml?rev=2958&r1=2957&r2=2958&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml1/impl/AttributeWithChildren.xml (original)
+++ trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml1/impl/AttributeWithChildren.xml Fri Mar 23 18:33:59 2012
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <saml1:Attribute xmlns:saml1="urn:oasis:names:tc:SAML:1.0:assertion">
-	<saml1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string"/>
-	<saml1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string"/>
-	<saml1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string"/>
-	<saml1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string"/>
+	<saml1:AttributeValue xmlns:xsd="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xsd:string"/>
+	<saml1:AttributeValue xmlns:xsd="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xsd:string"/>
+	<saml1:AttributeValue xmlns:xsd="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xsd:string"/>
+	<saml1:AttributeValue xmlns:xsd="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xsd:string"/>
 </saml1:Attribute>

Modified: trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml2/core/ResponseSuccessAuthnAttrib.xml
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml2/core/ResponseSuccessAuthnAttrib.xml?rev=2958&r1=2957&r2=2958&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml2/core/ResponseSuccessAuthnAttrib.xml (original)
+++ trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml2/core/ResponseSuccessAuthnAttrib.xml Fri Mar 23 18:33:59 2012
@@ -30,15 +30,15 @@
 		</saml2:AuthnStatement>
 		<saml2:AttributeStatement>
 			<saml2:Attribute FriendlyName="fooAttrib" Name="urn:foo:attrib" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-				<saml2:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">
+				<saml2:AttributeValue xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xsd:string">
 					SomeValue
 				</saml2:AttributeValue>

[... 47 lines stripped ...]