Multi-line svn commit, see body.

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

diff --git a/samltest/saml1/binding/SAML1ArtifactTest.h b/samltest/saml1/binding/SAML1ArtifactTest.h
index d7ddf2c..5f2dfca 100644 (file)
--- a/samltest/saml1/binding/SAML1ArtifactTest.h
+++ b/samltest/saml1/binding/SAML1ArtifactTest.h
@@ -39,7 +39,8 @@ public:
     void testSAML1Artifact() {\r
         try {\r
             QName idprole(samlconstants::SAML20MD_NS, IDPSSODescriptor::LOCAL_NAME);\r
-            SecurityPolicy policy(m_rules1, m_metadata, &idprole, m_trust, false);\r
+            SecurityPolicy policy(m_metadata, &idprole, m_trust, false);\r
+            policy.getRules().assign(m_rules1.begin(), m_rules1.end());\r
 \r
             // Read message to use from file.\r
             string path = data_path + "saml1/binding/SAML1Assertion.xml";\r
@@ -59,19 +60,22 @@ public:
 \r
             // Encode message.\r
             auto_ptr<MessageEncoder> encoder(\r
-                SAMLConfig::getConfig().MessageEncoderManager.newPlugin(samlconstants::SAML1_PROFILE_BROWSER_ARTIFACT, NULL)\r
+                SAMLConfig::getConfig().MessageEncoderManager.newPlugin(\r
+                    samlconstants::SAML1_PROFILE_BROWSER_ARTIFACT, pair<const DOMElement*,const XMLCh*>(NULL,NULL)\r
+                    )\r
                 );\r
-            encoder->setArtifactGenerator(this);\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",cred\r
+                *this,toSend.get(),"https://sp.example.org/SAML/SSO",m_metadata->getEntityDescriptor("https://sp.example.org/"),"state",this,cred\r
                 );\r
             toSend.release();\r
             \r
             // Decode message.\r
             string relayState;\r
             auto_ptr<MessageDecoder> decoder(\r
-                SAMLConfig::getConfig().MessageDecoderManager.newPlugin(samlconstants::SAML1_PROFILE_BROWSER_ARTIFACT, NULL)\r
+                SAMLConfig::getConfig().MessageDecoderManager.newPlugin(\r
+                    samlconstants::SAML1_PROFILE_BROWSER_ARTIFACT, pair<const DOMElement*,const XMLCh*>(NULL,NULL)\r
+                    )\r
                 );\r
             decoder->setArtifactResolver(this);\r
             auto_ptr<Response> response(dynamic_cast<Response*>(decoder->decode(relayState,*this,policy)));\r
@@ -128,7 +132,7 @@ public:
         TSM_ASSERT("Retrieved credential was null", cred!=NULL);\r
         response->marshall((DOMDocument*)NULL,&sigs,cred);\r
         SchemaValidators.validate(response.get());\r
-        policy.evaluate(*(response.get()), this);\r
+        policy.evaluate(*(response.get()), this, samlconstants::SAML11_PROTOCOL_ENUM);\r
         return response.release();\r
     }\r
 \r