Layered basic metadata plugin on top of new base class.

[shibboleth/opensaml2.git] / samltest / security / AbstractPKIXTrustEngineTest.h

diff --git a/samltest/security/AbstractPKIXTrustEngineTest.h b/samltest/security/AbstractPKIXTrustEngineTest.h
index 422bf94..4d43fc6 100644 (file)
--- a/samltest/security/AbstractPKIXTrustEngineTest.h
+++ b/samltest/security/AbstractPKIXTrustEngineTest.h
@@ -36,7 +36,8 @@ namespace {
             KeyResolver* m_resolver;
             bool m_done;
         public:
-            SampleIterator() : m_resolver(NULL), m_done(false) {
+            SampleIterator(const KeyResolver& keyResolver)
+                    : PKIXValidationInfoIterator(keyResolver), m_resolver(NULL), m_done(false) {
                 string config = data_path + "security/FilesystemKeyResolver.xml";
                 ifstream in(config.c_str());
                 DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(in);
@@ -71,9 +72,12 @@ namespace {
             }
         };
     
-        PKIXValidationInfoIterator* getPKIXValidationInfoIterator(const KeyInfoSource& keyInfoSource) const {
+        PKIXValidationInfoIterator* getPKIXValidationInfoIterator(
+            const KeyInfoSource& keyInfoSource,
+            const KeyResolver& keyResolver
+            ) const {
             dynamic_cast<const RoleDescriptor&>(keyInfoSource);
-            return new SampleIterator();
+            return new SampleIterator(keyResolver);
         }
     };
 };
@@ -89,7 +93,7 @@ public:
     }
 
     void testExplicitKeyTrustEngine() {
-        string config = data_path + "security/FilesystemMetadataProvider.xml";
+        string config = data_path + "security/XMLMetadataProvider.xml";
         ifstream in(config.c_str());
         DOMDocument* doc=XMLToolingConfig::getConfig().getParser().parse(in);
         XercesJanitor<DOMDocument> janitor(doc);
@@ -101,7 +105,7 @@ public:
 
         // Build metadata provider.
         auto_ptr<MetadataProvider> metadataProvider(
-            SAMLConfig::getConfig().MetadataProviderManager.newPlugin(FILESYSTEM_METADATA_PROVIDER,doc->getDocumentElement())
+            SAMLConfig::getConfig().MetadataProviderManager.newPlugin(XML_METADATA_PROVIDER,doc->getDocumentElement())
             );
         try {
             metadataProvider->init();