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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Mar 25 20:32:19 2014
New Revision: 5640

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5640&view=rev
Log:
Cleanup of NameID Decoder interfaces and impls, eliminate redundant policy checking.

Modified:
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectTest.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/NameIDDecoder.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/nameid/NameIdentifierDecoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/principalconnector/PrincipalConnector.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/attribute/principalconnector/PrinicpalConnectorCanonicalizer.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/BaseCryptoTransientDecoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/BaseTransientDecoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/CryptoTransientNameIDDecoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/CryptoTransientNameIdentifierDecoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/DirectNameIDDecoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/DirectNameIdentifierDecoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIDCanonicalization.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/NameIdentifierCanonicalization.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/TransientNameIDDecoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/TransientNameIdentifierDecoder.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/principalconnector/PrincipalConnectorTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/principalconnector/PrinicpalConnectorCanonicalizerTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/CryptoTransientNameIDDecoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/DirectDecoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/NameIDCanonicalizationTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/NameIdentifierCanonicalizationTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/TransientDecoderTest.java

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectTest.java?rev=5640&r1=5639&r2=5640&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectTest.java (original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/pc/DirectTest.java Tue Mar 25 20:32:19 2014
@@ -18,7 +18,7 @@
 package net.shibboleth.idp.attribute.resolver.spring.pc;
 
 import net.shibboleth.idp.attribute.resolver.spring.BaseAttributeDefinitionParserTest;
-import net.shibboleth.idp.authn.SubjectCanonicalizationException;
+import net.shibboleth.idp.authn.context.SubjectCanonicalizationContext;
 import net.shibboleth.idp.saml.impl.attribute.principalconnector.PrincipalConnector;
 import net.shibboleth.idp.saml.impl.nameid.DirectNameIDDecoder;
 import net.shibboleth.idp.saml.impl.nameid.DirectNameIdentifierDecoder;
@@ -34,23 +34,23 @@
  */
 public class DirectTest extends BaseAttributeDefinitionParserTest {
 
-    @Test public void simple() throws SubjectCanonicalizationException, NameDecoderException {
-        PrincipalConnector connector = getPrincipalConnector("direct.xml");
+    @Test public void simple() throws NameDecoderException {
+        final PrincipalConnector connector = getPrincipalConnector("direct.xml");
         
         Assert.assertTrue(connector.getNameIDDecoder() instanceof DirectNameIDDecoder);
         Assert.assertTrue(connector.getNameIdentifierDecoder() instanceof DirectNameIdentifierDecoder);
         Assert.assertEquals(connector.getFormat(), "https://example.org/direct");
         Assert.assertTrue(connector.getRelyingParties().isEmpty());
         
-        NameID id = new NameIDBuilder().buildObject();
+        final NameID id = new NameIDBuilder().buildObject();
         id.setFormat("https://example.org/sealer");
         id.setValue("The_value");
         
-        Assert.assertEquals(connector.decode(id, "", ""), "The_value");
+        Assert.assertEquals(connector.decode(new SubjectCanonicalizationContext(), id), "The_value");
     }
     
     @Test public void relyingParties() {

[... 1457 lines stripped ...]