[java-idp-testbed COMMIT] /trunk/src/test/java/idp/saml2/AbstractSAML2FlowTest.java

[noreply at shibboleth.net]

Author: scantor
Date: Wed May 14 17:13:05 2014
New Revision: 228

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=228&view=rev
Log:
Revert change, seems unrelated.

Modified:
    trunk/src/test/java/idp/saml2/AbstractSAML2FlowTest.java

Modified: trunk/src/test/java/idp/saml2/AbstractSAML2FlowTest.java
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/src/test/java/idp/saml2/AbstractSAML2FlowTest.java?rev=228&r1=227&r2=228&view=diff
==============================================================================
--- trunk/src/test/java/idp/saml2/AbstractSAML2FlowTest.java (original)
+++ trunk/src/test/java/idp/saml2/AbstractSAML2FlowTest.java Wed May 14 17:13:05 2014
@@ -68,11 +68,11 @@
     @Qualifier("sp.Credential") @Autowired private Credential spCredential;
     
     private Assertion decryptAssertion(final EncryptedAssertion encrypted) throws DecryptionException {
-        //final ChainingEncryptedKeyResolver chain = new ChainingEncryptedKeyResolver();
-        //chain.getResolverChain().add(new InlineEncryptedKeyResolver());
-        //chain.getResolverChain().add(new EncryptedElementTypeEncryptedKeyResolver());
+        final ChainingEncryptedKeyResolver chain = new ChainingEncryptedKeyResolver();
+        chain.getResolverChain().add(new InlineEncryptedKeyResolver());
+        chain.getResolverChain().add(new EncryptedElementTypeEncryptedKeyResolver());
         final Decrypter decrypter =
-                new Decrypter(null, new StaticKeyInfoCredentialResolver(spCredential), new InlineEncryptedKeyResolver());
+                new Decrypter(null, new StaticKeyInfoCredentialResolver(spCredential), chain);
         return decrypter.decrypt(encrypted);
     }