Collapse entity/role lookup in metadata API.

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

diff --git a/samltest/security/ExplicitKeyTrustEngineTest.h b/samltest/security/ExplicitKeyTrustEngineTest.h
index 0af1958..c014404 100644 (file)
--- a/samltest/security/ExplicitKeyTrustEngineTest.h
+++ b/samltest/security/ExplicitKeyTrustEngineTest.h
@@ -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();
@@ -86,7 +86,7 @@ public:
         cc.setPeerName("https://idp.example.org");
         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();