[java-identity-provider] branch master updated: IDP-1408 Remove deprecated encoders from generic test

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=482c58a15a04a5f44b3d9e36fac42aed1f3a60fd

The following commit(s) were added to refs/heads/master by this push:
       new  482c58a   IDP-1408 Remove deprecated encoders from generic test
482c58a is described below

commit 482c58a15a04a5f44b3d9e36fac42aed1f3a60fd
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Feb 1 11:37:43 2019 +0000

    IDP-1408 Remove deprecated encoders from generic test
    
    https://issues.shibboleth.net/jira/browse/IDP-1408
---
 .../idp/attribute/resolver/spring/AttributeResolverTest.java       | 2 +-
 .../idp/attribute/resolver/spring/attribute-resolver.xml           | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
index 068d9eb..0d99c73 100644
--- a/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
+++ b/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
@@ -183,7 +183,7 @@ public class AttributeResolverTest extends OpenSAMLInitBaseTestCase {
         final Map<String, IdPAttribute> resolvedAttributes = resolutionContext.getResolvedIdPAttributes();
         log.debug("resolved attributes '{}'", resolvedAttributes);
 
-        Assert.assertEquals(resolvedAttributes.size(), 15);
+        Assert.assertEquals(resolvedAttributes.size(), 14);
 
         // Static
         IdPAttribute attribute = resolvedAttributes.get("eduPersonAffiliation");
diff --git a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml
index 439ad98..d7b49fe 100644
--- a/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml
+++ b/idp-attribute-resolver-spring/src/test/resources/net/shibboleth/idp/attribute/resolver/spring/attribute-resolver.xml
@@ -198,13 +198,6 @@
         <AttributeEncoder xsi:type="SAML2XMLObject" name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" friendlyName="eduPersonTargetedID" />
     </AttributeDefinition>
     
-    <!-- Name Identifier related attributes -->
-
-    <AttributeDefinition id="transientId" xsi:type="TransientId">
-        <AttributeEncoder xsi:type="SAML1StringNameIdentifier" nameFormat="urn:mace:shibboleth:1.0:nameIdentifier"/>
-        <AttributeEncoder xsi:type="SAML2StringNameID" nameFormat="urn:oasis:names:tc:SAML:2.0:nameid-format:transient"/>
-    </AttributeDefinition>
-
     <!-- ========================================== -->
     <!--      Data Connectors                       -->
     <!-- ========================================== -->

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.