Making client_get_streaming_test.cpp build.

deanberris · deanberris · commit 82bba850f57c · 2012-03-11T20:59:53.000+11:00
diff --git a/boost/network/protocol/http/message/directives/status.hpp b/boost/network/protocol/http/message/directives/status.hpp
@@ -15,26 +15,16 @@
 
 namespace boost { namespace network { namespace http {
 
-template <class String>
 struct status_directive {
-
-  status_directive(String const & s)
-  : status_(s)
-  {}
-
-  void operator()(response_base & response) {
-    response.set_status(status_);
-  }
+  explicit status_directive(std::string const & s);
+  void operator()(response_base & response) const;
 
  protected:
-  
-  String status_;
-
+  std::string status_;
 };
 
-template <class String>
-inline status_directive<String> status(String const & response) {
-  return status_directive<String>(response);
+inline status_directive status(std::string const & response) {
+  return status_directive(response);
 }
 
 } // namespace http
diff --git a/boost/network/protocol/http/message/wrappers/status.hpp b/boost/network/protocol/http/message/wrappers/status.hpp
@@ -16,6 +16,7 @@ namespace impl {
 struct status_wrapper {
   explicit status_wrapper(response_base & response_);
   operator std::string () const;
+  operator uint16_t () const;
  private:
   response_base & response_;
 };
diff --git a/libs/network/test/http/client_get_streaming_test.cpp b/libs/network/test/http/client_get_streaming_test.cpp
@@ -7,7 +7,6 @@
 #include <boost/network/include/http/client.hpp>
 #include <boost/test/unit_test.hpp>
 #include <iostream>
-#include "client_types.hpp"
 
 namespace net = boost::network;
 namespace http = boost::network::http;
@@ -26,23 +25,28 @@ struct body_handler {
 };
 
 
-BOOST_AUTO_TEST_CASE_TEMPLATE(http_client_get_streaming_test, client, async_only_client_types) {
-    typename client::request request("http://www.boost.org");
-    typename client::response response;
-    typename client::string_type body_string;
-    typename client::string_type dummy_body;
-    body_handler handler_instance(body_string);
-    {
-        client client_;
-        BOOST_CHECK_NO_THROW( response = client_.get(request, http::_body_handler=handler_instance) );
-        typename net::headers_range<typename client::response>::type range = headers(response)["Content-Type"];
-        BOOST_CHECK ( !boost::empty(range) );
-        BOOST_CHECK_EQUAL ( body(response).size(), 0u );
-        BOOST_CHECK_EQUAL ( response.version().substr(0, 7), std::string("HTTP/1.") );
-        BOOST_CHECK_EQUAL ( response.status(), 200u );
-        BOOST_CHECK_EQUAL ( response.status_message(), std::string("OK") );
-        dummy_body = body(response);
-    }
-    BOOST_CHECK ( dummy_body == typename client::string_type() );
+BOOST_AUTO_TEST_CASE(http_client_get_streaming_test) {
+  http::client::request request("http://www.boost.org");
+  http::client::response response;
+  std::string body_string;
+  std::string dummy_body;
+  body_handler handler_instance(body_string);
+  {
+      http::client client_;
+      BOOST_CHECK_NO_THROW( response = client_.get(request, handler_instance) );
+      net::headers_wrapper::range_type range = headers(response)["Content-Type"];
+      BOOST_CHECK ( !boost::empty(range) );
+      BOOST_CHECK_EQUAL ( body(response).size(), 0u );
+      std::string version_, status_message_;
+      boost::uint16_t status_;
+      version_ = version(response);
+      status_ = status(response);
+      status_message_ = status_message(response);
+      BOOST_CHECK_EQUAL ( version_.substr(0, 7), std::string("HTTP/1.") );
+      BOOST_CHECK_EQUAL ( status_, 200u );
+      BOOST_CHECK_EQUAL ( status_message_, std::string("OK") );
+      dummy_body = body(response);
+  }
+  BOOST_CHECK ( dummy_body == std::string() );
 }
 
