[java-identity-provider COMMIT] in /trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribu...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Apr 24 09:14:23 2013
New Revision: 4422

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4422&view=rev
Log:
IDP-205
Juggle some sub element orders so that we test non schema conformant parsing.

Modified:
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mapped.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated.xml
    trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated2.xml

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mapped.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mapped.xml?rev=4422&r1=4421&r2=4422&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mapped.xml (original)
+++ trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/mapped/mapped.xml Wed Apr 24 09:14:23 2013
@@ -1,14 +1,14 @@
 <resolver:AttributeDefintion xsi:type="ad:Mapped"
 	xmlns:resolver="urn:mace:shibboleth:2.0:resolver" xmlns:ad="urn:mace:shibboleth:2.0:resolver:ad"
 	xmlns:enc="urn:mace:shibboleth:2.0:attribute:encoder" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" id="Mapped">
-	<ad:DefaultValue passThru="true">foobar</ad:DefaultValue>
-	<ad:ValueMap>
+	<ValueMap>
 		<ad:ReturnValue>return</ad:ReturnValue>
 		<ad:SourceValue>source</ad:SourceValue>
-	</ad:ValueMap>
-	<ad:ValueMap>
+	</ValueMap>
+    <ad:DefaultValue passThru="true">foobar</ad:DefaultValue>
+	<ValueMap>
 		<ad:ReturnValue>return1</ad:ReturnValue>
 		<ad:SourceValue>source2</ad:SourceValue>
-	</ad:ValueMap>
+	</ValueMap>
 
 </resolver:AttributeDefintion>

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated.xml?rev=4422&r1=4421&r2=4422&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated.xml (original)
+++ trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated.xml Wed Apr 24 09:14:23 2013
@@ -7,14 +7,14 @@
     xsi:type="ad:Simple" id="simplePopulated" sourceAttributeID="flibble">
  
     <DisplayName xml:lang="en">NameInEnglish</DisplayName>
-    <DisplayName xml:lang="fr">NameEnFrancais</DisplayName>
+    <Dependency ref="dep2"/>
 
     <DisplayDescription xml:lang="en">DescInEnglish</DisplayDescription>
-    <DisplayDescription xml:lang="fr">DescEnFrancais</DisplayDescription>
+    <DisplayName xml:lang="fr">NameEnFrancais</DisplayName>
     <DisplayDescription xml:lang="ca">DescInCanadian</DisplayDescription>
     
     <Dependency ref="dep1"/>
-    <Dependency ref="dep2"/>
+    <DisplayDescription xml:lang="fr">DescEnFrancais</DisplayDescription>
     <Dependency ref="dep3"/>
 <!--
     <AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:0.9.2342.19200300.100.1.3" friendlyName="mail" />

Modified: trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated2.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated2.xml?rev=4422&r1=4421&r2=4422&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated2.xml (original)
+++ trunk/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/ad/simpleAttributePopulated2.xml Wed Apr 24 09:14:23 2013
@@ -6,8 +6,8 @@
     dependencyOnly="false"
     xsi:type="ad:Simple" id="simplePopulated2" >
  
+    <Dependency ref="dep3"/>
     <DisplayName xml:lang="en">NameInAmerican</DisplayName>
-    <Dependency ref="dep3"/>
 <!--
     <AttributeEncoder xsi:type="enc:SAML1String" name="urn:mace:dir:attribute-def:mail" />
     <AttributeEncoder xsi:type="enc:SAML2String" name="urn:oid:0.9.2342.19200300.100.1.3" friendlyName="mail" />