Collapse entity/role lookup in metadata API.

[shibboleth/cpp-opensaml.git] / samltest / saml1 / binding / SAML1ArtifactTest.h

diff --git a/samltest/saml1/binding/SAML1ArtifactTest.h b/samltest/saml1/binding/SAML1ArtifactTest.h
index ae593b1..03a0972 100644 (file)
--- a/samltest/saml1/binding/SAML1ArtifactTest.h
+++ b/samltest/saml1/binding/SAML1ArtifactTest.h
@@ -53,7 +53,7 @@ public:
             janitor.release();\r
 \r
             CredentialCriteria cc;\r
-            cc.setUsage(CredentialCriteria::SIGNING_CREDENTIAL);\r
+            cc.setUsage(Credential::SIGNING_CREDENTIAL);\r
             Locker clocker(m_creds);\r
             const Credential* cred = m_creds->resolve(&cc);\r
             TSM_ASSERT("Retrieved credential was null", cred!=NULL);\r
@@ -66,7 +66,13 @@ public:
                 );\r
             Locker locker(m_metadata);\r
             encoder->encode(\r
-                *this,toSend.get(),"https://sp.example.org/SAML/SSO",m_metadata->getEntityDescriptor("https://sp.example.org/"),"state",this,cred\r
+                *this,\r
+                toSend.get(),\r
+                "https://sp.example.org/SAML/SSO",\r
+                m_metadata->getEntityDescriptor(MetadataProvider::Criteria("https://sp.example.org/")).first,\r
+                "state",\r
+                this,\r
+                cred\r
                 );\r
             toSend.release();\r
             \r
@@ -126,7 +132,7 @@ public:
         response->setSignature(SignatureBuilder::buildSignature());\r
         vector<Signature*> sigs(1,response->getSignature());\r
         CredentialCriteria cc;\r
-        cc.setUsage(CredentialCriteria::SIGNING_CREDENTIAL);\r
+        cc.setUsage(Credential::SIGNING_CREDENTIAL);\r
         Locker clocker(m_creds);\r
         const Credential* cred = m_creds->resolve(&cc);\r
         TSM_ASSERT("Retrieved credential was null", cred!=NULL);\r