Collapse entity/role lookup in metadata API.

[shibboleth/cpp-opensaml.git] / samltest / security / ExplicitKeyTrustEngineTest.h

diff --git a/samltest/security/ExplicitKeyTrustEngineTest.h b/samltest/security/ExplicitKeyTrustEngineTest.h
index 5753c45..c014404 100644 (file)
--- a/samltest/security/ExplicitKeyTrustEngineTest.h
+++ b/samltest/security/ExplicitKeyTrustEngineTest.h
@@ -20,7 +20,7 @@
 #include <saml/saml2/metadata/Metadata.h>
 #include <saml/saml2/metadata/MetadataCredentialCriteria.h>
 #include <saml/saml2/metadata/MetadataProvider.h>
-#include <xmltooling/security/TrustEngine.h>
+#include <xmltooling/security/SignatureTrustEngine.h>
 
 using namespace opensaml::saml2;
 using namespace opensaml::saml2md;
@@ -73,7 +73,7 @@ public:
         janitor2.release();
 
         Locker locker(metadataProvider.get());
-        const EntityDescriptor* descriptor = metadataProvider->getEntityDescriptor("https://idp.example.org");
+        const EntityDescriptor* descriptor = metadataProvider->getEntityDescriptor(MetadataProvider::Criteria("https://idp.example.org")).first;
         TSM_ASSERT("Retrieved entity descriptor was null", descriptor!=NULL);
         
         RoleDescriptor* role=descriptor->getIDPSSODescriptors().front();
@@ -84,9 +84,9 @@ public:
 
         MetadataCredentialCriteria cc(*role);
         cc.setPeerName("https://idp.example.org");
-        TSM_ASSERT("Signature failed to validate.", trustEngine->validate(*sig, *metadataProvider, &cc));
+        TSM_ASSERT("Signature failed to validate.", dynamic_cast<SignatureTrustEngine*>(trustEngine.get())->validate(*sig, *metadataProvider, &cc));
 
-        descriptor = metadataProvider->getEntityDescriptor("https://idp2.example.org");
+        descriptor = metadataProvider->getEntityDescriptor(MetadataProvider::Criteria("https://idp2.example.org")).first;
         TSM_ASSERT("Retrieved entity descriptor was null", descriptor!=NULL);
         
         role=descriptor->getIDPSSODescriptors().front();
@@ -94,6 +94,6 @@ public:
 
         MetadataCredentialCriteria cc2(*role);
         cc2.setPeerName("https://idp2.example.org");
-        TSM_ASSERT("Signature validated.", !trustEngine->validate(*sig, *metadataProvider, &cc2));
+        TSM_ASSERT("Signature validated.", !dynamic_cast<SignatureTrustEngine*>(trustEngine.get())->validate(*sig, *metadataProvider, &cc2));
     }
 };