Refactor message extraction into decoders and clients.

[shibboleth/opensaml2.git] / samltest / saml1 / binding / SAML1ArtifactTest.h

diff --git a/samltest/saml1/binding/SAML1ArtifactTest.h b/samltest/saml1/binding/SAML1ArtifactTest.h
index 5f2dfca..ae593b1 100644 (file)
--- a/samltest/saml1/binding/SAML1ArtifactTest.h
+++ b/samltest/saml1/binding/SAML1ArtifactTest.h
@@ -40,7 +40,7 @@ public:
         try {\r
             QName idprole(samlconstants::SAML20MD_NS, IDPSSODescriptor::LOCAL_NAME);\r
             SecurityPolicy policy(m_metadata, &idprole, m_trust, false);\r
-            policy.getRules().assign(m_rules1.begin(), m_rules1.end());\r
+            policy.getRules().assign(m_rules.begin(), m_rules.end());\r
 \r
             // Read message to use from file.\r
             string path = data_path + "saml1/binding/SAML1Assertion.xml";\r
@@ -83,7 +83,7 @@ public:
             // Test the results.\r
             TSM_ASSERT_EQUALS("TARGET was not the expected result.", relayState, "state");\r
             TSM_ASSERT("SAML Response not decoded successfully.", response.get());\r
-            TSM_ASSERT("Message was not verified.", policy.isSecure());\r
+            TSM_ASSERT("Message was not verified.", policy.isAuthenticated());\r
             auto_ptr_char entityID(policy.getIssuer()->getName());\r
             TSM_ASSERT("Issuer was not expected.", !strcmp(entityID.get(),"https://idp.example.org/"));\r
             TSM_ASSERT_EQUALS("Assertion count was not correct.", response->getAssertions().size(), 1);\r
@@ -132,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, samlconstants::SAML11_PROTOCOL_ENUM);\r
+        policy.evaluate(*(response.get()), this);\r
         return response.release();\r
     }\r
 \r