Moved URLEncoder down to tooling lib, added exception->querystring method.

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

diff --git a/samltest/binding.h b/samltest/binding.h
index fdbe990..3355144 100644 (file)
--- a/samltest/binding.h
+++ b/samltest/binding.h
@@ -1,5 +1,5 @@
 /*\r
- *  Copyright 2001-2006 Internet2\r
+ *  Copyright 2001-2007 Internet2\r
  * \r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
@@ -22,12 +22,13 @@
 #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/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
@@ -126,10 +127,6 @@ public:
         return "https";\r
     }\r
 \r
-    bool isSecure() const {\r
-        return true;\r
-    }\r
-\r
     const char* getHostname() const {\r
         return "localhost";\r
     }\r
@@ -194,18 +191,10 @@ public:
     \r
     // HTTPResponse methods\r
     \r
-    void setHeader(const char* name, const char* value) {\r
+    void setResponseHeader(const char* name, const char* value) {\r
         m_headers[name] = value ? value : "";\r
     }\r
 \r
-    void setContentType(const char* type) {\r
-        setHeader("Content-Type", type);\r
-    }\r
-    \r
-    void setCookie(const char* name, const char* value) {\r
-        m_headers["Set-Cookie"] = string(name) + "=" + (value ? value : "");\r
-    }\r
-    \r
     // The amount of error checking missing from this is incredible, but as long\r
     // as the test data isn't unexpected or malformed, it should work.\r
     \r
@@ -224,7 +213,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
@@ -260,14 +249,6 @@ public:
         return decoded;\r
     }\r
     \r
-    long sendResponse(std::istream& inputStream) {\r
-        return sendResponse(inputStream, HTTPResponse::SAML_HTTP_STATUS_OK);\r
-    }\r
-\r
-    long sendError(std::istream& inputStream) {\r
-        return sendResponse(inputStream, HTTPResponse::SAML_HTTP_STATUS_ERROR);\r
-    }\r
-\r
     long sendResponse(std::istream& inputStream, long status) {\r
         m_method="POST";\r
         string page,line;\r