[java-identity-provider COMMIT] in /trunk: idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/res...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Aug  6 09:20:27 2014
New Revision: 6401

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6401&view=rev
Log:
IDP-461 move defaulting away from the parser.  Fix tests, use symbolic defaults on inline random values.

Modified:
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML1NameIdentifierAttributeDefinitionTest.java
    trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML2NameIDAttributeDefinitionTest.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/SAML1NameIdentifierAttributeDefinition.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/SAML2NameIDAttributeDefinition.java

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML1NameIdentifierAttributeDefinitionTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML1NameIdentifierAttributeDefinitionTest.java?rev=6401&r1=6400&r2=6401&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML1NameIdentifierAttributeDefinitionTest.java (original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML1NameIdentifierAttributeDefinitionTest.java Wed Aug  6 09:20:27 2014
@@ -97,7 +97,7 @@
         Collection<String> nameValues = new HashSet<String>(2);
         for (IdPAttributeValue val : values) {
             NameIdentifier id = (NameIdentifier) val.getValue();
-            Assert.assertNull(id.getFormat());
+            Assert.assertEquals(id.getFormat(),  "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified");
             Assert.assertEquals(id.getNameQualifier(), IDP_ENTITY_ID);
             nameValues.add(id.getNameIdentifier());
         }

Modified: trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML2NameIDAttributeDefinitionTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML2NameIDAttributeDefinitionTest.java?rev=6401&r1=6400&r2=6401&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML2NameIDAttributeDefinitionTest.java (original)
+++ trunk/idp-attribute-resolver-impl/src/test/java/net/shibboleth/idp/attribute/resolver/ad/impl/SAML2NameIDAttributeDefinitionTest.java Wed Aug  6 09:20:27 2014
@@ -105,7 +105,7 @@
         Collection<String> nameValues = new HashSet<String>(2);
         for (IdPAttributeValue val : values) {
             NameID id = (NameID) val.getValue();
-            Assert.assertNull(id.getFormat());
+            Assert.assertEquals(id.getFormat(), "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified");
             Assert.assertNull(id.getSPProvidedID());
             Assert.assertEquals(id.getSPNameQualifier(), TestSources.SP_ENTITY_ID);
             Assert.assertEquals(id.getNameQualifier(), TestSources.IDP_ENTITY_ID);

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/SAML1NameIdentifierAttributeDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/SAML1NameIdentifierAttributeDefinition.java?rev=6401&r1=6400&r2=6401&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/SAML1NameIdentifierAttributeDefinition.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/SAML1NameIdentifierAttributeDefinition.java Wed Aug  6 09:20:27 2014
@@ -70,7 +70,7 @@
         nameIdentifierBuilder = (SAMLObjectBuilder<NameIdentifier>)
                 XMLObjectProviderRegistrySupport.getBuilderFactory().<NameIdentifier>getBuilderOrThrow(
                         NameIdentifier.DEFAULT_ELEMENT_NAME);
-        nameIdFormat = "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified";
+        nameIdFormat = NameIdentifier.UNSPECIFIED;
     }
 
     /**

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/SAML2NameIDAttributeDefinition.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/resolver/impl/SAML2NameIDAttributeDefinition.java?rev=6401&r1=6400&r2=6401&view=diff
==============================================================================

[... 20 lines stripped ...]