Bump lib version.

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

diff --git a/samltest/binding.h b/samltest/binding.h
index 4d4cc16..3564bb1 100644 (file)
--- a/samltest/binding.h
+++ b/samltest/binding.h
@@ -17,17 +17,18 @@
 #include "internal.h"\r
 \r
 #include <saml/SAMLConfig.h>\r
-#include <saml/binding/HTTPRequest.h>\r
-#include <saml/binding/HTTPResponse.h>\r
 #include <saml/binding/MessageDecoder.h>\r
 #include <saml/binding/MessageEncoder.h>\r
 #include <saml/binding/SecurityPolicyRule.h>\r
-#include <saml/binding/URLEncoder.h>\r
 #include <saml/saml2/metadata/Metadata.h>\r
 #include <saml/saml2/metadata/MetadataProvider.h>\r
+#include <xmltooling/io/HTTPRequest.h>\r
+#include <xmltooling/io/HTTPResponse.h>\r
 #include <xmltooling/security/TrustEngine.h>\r
+#include <xmltooling/util/URLEncoder.h>\r
 \r
 using namespace opensaml::saml2md;\r
+using namespace opensaml;\r
 using namespace xmlsignature;\r
 \r
 class SAMLBindingBaseTestCase : public HTTPRequest, public HTTPResponse\r
@@ -40,8 +41,7 @@ protected:
     map<string,string> m_headers;\r
     string m_method,m_url,m_query;\r
     vector<XSECCryptoX509*> m_clientCerts;\r
-    vector<const SecurityPolicyRule*> m_rules1;\r
-    vector<const SecurityPolicyRule*> m_rules2;\r
+    vector<const SecurityPolicyRule*> m_rules;\r
 \r
 public:\r
     void setUp() {\r
@@ -80,15 +80,9 @@ public:
                 \r
             m_trust = XMLToolingConfig::getConfig().TrustEngineManager.newPlugin(EXPLICIT_KEY_TRUSTENGINE, NULL);\r
 \r
-            m_rules1.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(SAML1MESSAGE_POLICY_RULE,NULL));\r
-            m_rules1.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(MESSAGEFLOW_POLICY_RULE,NULL));\r
-            m_rules1.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(SIMPLESIGNING_POLICY_RULE,NULL));\r
-            m_rules1.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(XMLSIGNING_POLICY_RULE,NULL));\r
-\r
-            m_rules2.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(SAML2MESSAGE_POLICY_RULE,NULL));\r
-            m_rules2.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(MESSAGEFLOW_POLICY_RULE,NULL));\r
-            m_rules2.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(SIMPLESIGNING_POLICY_RULE,NULL));\r
-            m_rules2.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(XMLSIGNING_POLICY_RULE,NULL));\r
+            m_rules.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(MESSAGEFLOW_POLICY_RULE,NULL));\r
+            m_rules.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(SIMPLESIGNING_POLICY_RULE,NULL));\r
+            m_rules.push_back(SAMLConfig::getConfig().SecurityPolicyRuleManager.newPlugin(XMLSIGNING_POLICY_RULE,NULL));\r
         }\r
         catch (XMLToolingException& ex) {\r
             TS_TRACE(ex.what());\r
@@ -99,10 +93,8 @@ public:
     }\r
     \r
     void tearDown() {\r
-        for_each(m_rules1.begin(), m_rules1.end(), xmltooling::cleanup<SecurityPolicyRule>());\r
-        m_rules1.clear();\r
-        for_each(m_rules2.begin(), m_rules2.end(), xmltooling::cleanup<SecurityPolicyRule>());\r
-        m_rules2.clear();\r
+        for_each(m_rules.begin(), m_rules.end(), xmltooling::cleanup<SecurityPolicyRule>());\r
+        m_rules.clear();\r
         delete m_creds;\r
         delete m_metadata;\r
         delete m_trust;\r
@@ -212,7 +204,7 @@ public:
                 pch=strchr(pch,'&');\r
                 if (pch)\r
                     *pch++=0;\r
-                SAMLConfig::getConfig().getURLEncoder()->decode(value);\r
+                XMLToolingConfig::getConfig().getURLEncoder()->decode(value);\r
                 m_fields[name] = value;\r
                 name = pch; \r
             }\r
@@ -248,6 +240,8 @@ public:
         return decoded;\r
     }\r
     \r
+    using HTTPResponse::sendResponse;\r
+\r
     long sendResponse(std::istream& inputStream, long status) {\r
         m_method="POST";\r
         string page,line;\r