X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=xmltoolingtest%2FFilesystemCredentialResolverTest.h;h=365c741cb281be299275f4134e4d5f20c8e14e62;hb=80753d1cceda431c629b623897df3aa74b4ff930;hp=66f07e4cb460020d8083912eab3678be3724ec15;hpb=81b488b2790e7bdeb2f43560b1d4a7d22c3dfdf5;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/xmltoolingtest/FilesystemCredentialResolverTest.h b/xmltoolingtest/FilesystemCredentialResolverTest.h
index 66f07e4..365c741 100644
--- a/xmltoolingtest/FilesystemCredentialResolverTest.h
+++ b/xmltoolingtest/FilesystemCredentialResolverTest.h
@@ -41,15 +41,17 @@ public:
 
         auto_ptr<CredentialResolver> credResolver(
             XMLToolingConfig::getConfig().CredentialResolverManager.newPlugin(
-                FILESYSTEM_CREDENTIAL_RESOLVER,doc->getDocumentElement()
+                CHAINING_CREDENTIAL_RESOLVER,doc->getDocumentElement()
                 )
             );
 
+        vector<const Credential*> creds;
         Locker locker(credResolver.get());
-        const X509Credential* cred=dynamic_cast<const X509Credential*>(credResolver->resolve());
-        TSM_ASSERT("Retrieved credential was null", cred!=nullptr);
-        TSM_ASSERT("Retrieved key was null", cred->getPrivateKey()!=nullptr);
-        TSM_ASSERT_EQUALS("Unexpected number of certificates", 1, cred->getEntityCertificateChain().size());
-        TSM_ASSERT_EQUALS("Custom key name not found", 1, cred->getKeyNames().count("Sample Key"));
+        credResolver->resolve(creds);
+        TSM_ASSERT_EQUALS("Retrieved credential was null", 1, creds.size());
+        TSM_ASSERT("Retrieved key was null", creds.front()->getPrivateKey()!=nullptr);
+        TSM_ASSERT_EQUALS("Unexpected number of certificates", 1,
+            dynamic_cast<const X509Credential*>(creds.front())->getEntityCertificateChain().size());
+        TSM_ASSERT_EQUALS("Custom key name not found", 1, creds.front()->getKeyNames().count("Sample Key"));
     }
 };