[java-identity-provider COMMIT] in /trunk/idp-saml-impl/src: main/java/net/shibboleth/idp/saml/impl/nameid/BaseCrypto...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Mar  3 04:15:08 2014
New Revision: 5509

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5509&view=rev
Log:
Cry[ptoTransient no longed encodes the issuer, it is therefore meaningless to test for it.  Supress spurious test.  Also javadoc clarifications

Modified:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/BaseCryptoTransientDecoder.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/CryptoTransientNameIDDecoderTest.java

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/BaseCryptoTransientDecoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/BaseCryptoTransientDecoder.java?rev=5509&r1=5508&r2=5509&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/BaseCryptoTransientDecoder.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/impl/nameid/BaseCryptoTransientDecoder.java Mon Mar  3 04:15:08 2014
@@ -34,7 +34,8 @@
 
 /**
  * An abstract action which contains the logic to do crypto transient decoding matching. This reverses the work done by
- * {@link net.shibboleth.idp.attribute.resolver.impl.ad.CryptoTransientIdAttributeDefinition}
+ * {@link net.shibboleth.idp.attribute.resolver.impl.ad.CryptoTransientIdAttributeDefinition} and
+ * {@link CryptoTransientIdGenerationStrategy}
  */
 public abstract class BaseCryptoTransientDecoder extends AbstractIdentifiableInitializableComponent {
 

Modified: trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/CryptoTransientNameIDDecoderTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/CryptoTransientNameIDDecoderTest.java?rev=5509&r1=5508&r2=5509&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/CryptoTransientNameIDDecoderTest.java (original)
+++ trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/CryptoTransientNameIDDecoderTest.java Mon Mar  3 04:15:08 2014
@@ -56,7 +56,7 @@
  */
 public class CryptoTransientNameIDDecoderTest extends OpenSAMLInitBaseTestCase {
 
-    private final static long TIMEOUT = 5000;
+    private final static long TIMEOUT = 50000;
 
     private final static String PRINCIPAL = "ThePrincipal";
 
@@ -150,13 +150,6 @@
         decoder.decode(ct, ISSUER, "my" + RECIPIENT);
     }
 
-    @Test(expectedExceptions = {SubjectCanonicalizationException.class,}) public void badIdP()
-            throws SubjectCanonicalizationException, DataSealerException, NameDecoderException {
-        String ct = code(PRINCIPAL, ISSUER, RECIPIENT);
-
-        decoder.decode(ct, "my" + ISSUER, RECIPIENT);
-    }
-
     @Test public void decode() throws ComponentInitializationException, ResolutionException, DataSealerException,
             InterruptedException, ProfileException {
         final CryptoTransientIdAttributeDefinition defn = new CryptoTransientIdAttributeDefinition();