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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jul 29 15:41:32 2014
New Revision: 6355

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6355&view=rev
Log:
Fix failing tests.

Added:
    trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/resolver/SealerKeyStore.kver
Modified:
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/resolver/impl/CryptoTransientIdAttributeDefinitionTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIDDecoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIdentifierDecoderTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientSAML1NameIdentifierGeneratorTest.java
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientSAML2NameIDGeneratorTest.java
    trunk/idp-saml-impl/src/test/resources/net/shibboleth/idp/saml/impl/attribute/resolver/SealerKeyStore.jks

Modified: trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/resolver/impl/CryptoTransientIdAttributeDefinitionTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/resolver/impl/CryptoTransientIdAttributeDefinitionTest.java?rev=6355&r1=6354&r2=6355&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/resolver/impl/CryptoTransientIdAttributeDefinitionTest.java (original)
+++ trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/attribute/resolver/impl/CryptoTransientIdAttributeDefinitionTest.java Tue Jul 29 15:41:32 2014
@@ -30,6 +30,7 @@
 import net.shibboleth.idp.saml.impl.TestSources;
 import net.shibboleth.idp.saml.nameid.impl.CryptoTransientIdGenerationStrategy;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.security.BasicKeystoreKeyStrategy;
 import net.shibboleth.utilities.java.support.security.DataSealer;
 import net.shibboleth.utilities.java.support.security.DataSealerException;
 
@@ -69,14 +70,21 @@
         final Resource keyStore =
                 new ClassPathResource("/net/shibboleth/idp/saml/impl/attribute/resolver/SealerKeyStore.jks");
         Assert.assertTrue(keyStore.exists());
+        
+        final Resource version =
+                new ClassPathResource("/net/shibboleth/idp/saml/impl/attribute/resolver/SealerKeyStore.kver");
+        Assert.assertTrue(version.exists());
 
+        final BasicKeystoreKeyStrategy kstrategy = new BasicKeystoreKeyStrategy();
+        kstrategy.setKeyAlias("secret");
+        kstrategy.setKeyPassword("kpassword");
+        kstrategy.setKeystorePassword("password");
+        kstrategy.setKeystoreResource(ResourceHelper.of(keyStore));
+        kstrategy.setKeyVersionResource(ResourceHelper.of(version));
+        kstrategy.initialize();
+        
         dataSealer = new DataSealer();
-        dataSealer.setCipherKeyAlias("secret");
-        dataSealer.setCipherKeyPassword("kpassword");
-
-        dataSealer.setKeystorePassword("password");
-        dataSealer.setKeystoreResource(ResourceHelper.of(keyStore));
-
+        dataSealer.setKeyStrategy(kstrategy);
         dataSealer.initialize();
 
         strategy = new CryptoTransientIdGenerationStrategy();

Modified: trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIDDecoderTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIDDecoderTest.java?rev=6355&r1=6354&r2=6355&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIDDecoderTest.java (original)
+++ trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/nameid/impl/CryptoTransientNameIDDecoderTest.java Tue Jul 29 15:41:32 2014
@@ -37,6 +37,7 @@
 import net.shibboleth.idp.saml.nameid.NameDecoderException;
 import net.shibboleth.idp.saml.nameid.NameIDCanonicalizationFlowDescriptor;
 import net.shibboleth.utilities.java.support.component.ComponentInitializationException;
+import net.shibboleth.utilities.java.support.security.BasicKeystoreKeyStrategy;
 import net.shibboleth.utilities.java.support.security.DataSealer;
 import net.shibboleth.utilities.java.support.security.DataSealerException;
 
@@ -80,14 +81,21 @@
         final Resource keyStore =
                 new ClassPathResource("/net/shibboleth/idp/saml/impl/attribute/resolver/SealerKeyStore.jks");
         Assert.assertTrue(keyStore.exists());
-
+        
+        final Resource version =
+                new ClassPathResource("/net/shibboleth/idp/saml/impl/attribute/resolver/SealerKeyStore.kver");
+        Assert.assertTrue(version.exists());
+

[... 165 lines stripped ...]