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

[noreply at shibboleth.net]

Author: rdw
Date: Tue Mar 18 11:15:05 2014
New Revision: 5601

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=5601&view=rev
Log:
IDP-277 "Enabled" makes no sense for a profile configuration any more.  Remove it.  If we need it we can always add it back in again. more missed Missed test

Modified:
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/resolver/CryptoTransientIdAttributeDefinitionTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/resolver/TransientIdAttributeDefinitionTest.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/CryptoTransientNameIdentifierDecoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/nameid/TransientDecoderTest.java

Modified: trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/resolver/CryptoTransientIdAttributeDefinitionTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/resolver/CryptoTransientIdAttributeDefinitionTest.java?rev=5601&r1=5600&r2=5601&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/resolver/CryptoTransientIdAttributeDefinitionTest.java (original)
+++ trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/impl/attribute/resolver/CryptoTransientIdAttributeDefinitionTest.java Tue Mar 18 11:15:05 2014
@@ -27,6 +27,7 @@
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolutionContext;
 import net.shibboleth.idp.attribute.resolver.context.AttributeResolverWorkContext;
 import net.shibboleth.idp.saml.impl.TestSources;
+import net.shibboleth.idp.saml.impl.nameid.CryptoTransientIdGenerationStrategy;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
 import net.shibboleth.utilities.java.support.security.DataSealer;
 import net.shibboleth.utilities.java.support.security.DataSealerException;
@@ -39,29 +40,35 @@
 import org.testng.annotations.Test;
 
 /**
- * Tests for {Link CryptoTransientIdAttributeDefinition}.
+ * Tests for CryptoTransientIdAttributeDefinition, which is a
+ * 
+ * @link {@link TransientIdAttributeDefinition} with an injected {@link CryptoTransientIdGenerationStrategy}
  */
 
-public class CryptoTransientIdAttributeDefinitionTest   extends OpenSAMLInitBaseTestCase {
+public class CryptoTransientIdAttributeDefinitionTest extends OpenSAMLInitBaseTestCase {
 
     private static final String ID = "CryptoTransientIdAttributeDefn";
 
     private static final long TIMEOUT = 500;
 
+    private CryptoTransientIdGenerationStrategy strategy;
+
     private DataSealer dataSealer;
 
     /**
-     * Set up the data sealer.  We take advantage of the fact that Spring a {@link ClassPathResource} wraps a files.
+     * Set up the data sealer. We take advantage of the fact that Spring a {@link ClassPathResource} wraps a files.
      * 
      * @throws IOException
      * @throws DataSealerException
-     * @throws ComponentInitializationException 
+     * @throws ComponentInitializationException
      */
-    @BeforeClass public void setupDataSealer() throws IOException, DataSealerException, ComponentInitializationException {
-        
-        final Resource keyStore  = new ClassPathResource("/net/shibboleth/idp/saml/impl/attribute/resolver/SealerKeyStore.jks");
+    @BeforeClass public void setupStrategyAndSealer() throws IOException, DataSealerException,
+            ComponentInitializationException {
+
+        final Resource keyStore =
+                new ClassPathResource("/net/shibboleth/idp/saml/impl/attribute/resolver/SealerKeyStore.jks");
         Assert.assertTrue(keyStore.exists());
-        
+
         final String keyStorePath = keyStore.getFile().getAbsolutePath();
 
         dataSealer = new DataSealer();
@@ -73,35 +80,19 @@
 
         dataSealer.initialize();
 
+        strategy = new CryptoTransientIdGenerationStrategy();
+        strategy.setDataSealer(dataSealer);
+        strategy.setId("strategy");
+        strategy.setIdLifetime(TIMEOUT);
+        strategy.initialize();
+
     }
 
-    @Test public void setterGetters() throws ComponentInitializationException {
-        CryptoTransientIdAttributeDefinition defn = new CryptoTransientIdAttributeDefinition();
+    @Test public void badVals() throws ComponentInitializationException {
+        final TransientIdAttributeDefinition defn = new TransientIdAttributeDefinition(strategy);
         defn.setId(ID);
-        try {
-            defn.initialize();
-            Assert.fail("null dataSealer");
-        } catch (ComponentInitializationException e) {
-            // OK
-        }
-        defn.setDataSealer(dataSealer);
         defn.initialize();
-        Assert.assertEquals(defn.getIdLifetime(), 4 * 1000 * 3600);

[... 301 lines stripped ...]