Updated header parser test case, removed duplicate status code

Rudolfs Bundulis · Rudolfs Bundulis · commit 564cafab2cc0 · 2013-12-04T19:44:35.000+02:00
diff --git a/boost/network/protocol/http/impl/response.ipp b/boost/network/protocol/http/impl/response.ipp
@@ -53,7 +53,6 @@ namespace boost { namespace network { namespace http {
             temporary_redirect = 307,
             bad_request = 400,
             unauthorized = 401,
-            forbidden = 403,
             payment_required = 402,
             forbidden = 403,
             not_found = 404,
diff --git a/libs/network/test/http/server_header_parser_test.cpp b/libs/network/test/http/server_header_parser_test.cpp
@@ -7,6 +7,8 @@
 #include <boost/network/protocol/http/server.hpp>
 #include <boost/config/warning_disable.hpp>
 #include <boost/test/unit_test.hpp>
+#define BOOST_LOCALE_NO_LIB
+#include <boost/locale/encoding.hpp>
 #include <string>
 #include <iostream>
 
@@ -26,17 +28,20 @@ namespace fusion = boost::fusion;
 using namespace boost::network::http;
 
 BOOST_AUTO_TEST_CASE(async_connection_parse_headers) {
-    request_header_narrow utf8_header = { "X-Utf8-Test-Header", "R\uc5abdolfs" };
+    std::wstring utf16_test_name = L"R\u016bdolfs";
+    request_header_narrow utf8_header = { "X-Utf8-Test-Header", boost::locale::conv::utf_to_utf<char>(utf16_test_name) };
     std::string valid_http_request;
     valid_http_request.append(utf8_header.name).append(": ").append(utf8_header.value).append("\r\n\r\n");
     std::vector<request_header_narrow> headers;
     parse_headers(valid_http_request, headers);
-    std::vector<request_header_narrow>::iterator utf8_header_iterator = std::find_if(headers.begin(), headers.end(), [&utf8_header, &utf8_header_iterator](request_header_narrow& header)
+    std::vector<request_header_narrow>::iterator header_iterator = headers.begin();
+    for(; header_iterator != headers.end(); ++ header_iterator)
     {
-        if (header.name == utf8_header.name && header.value == utf8_header.value)
-            return true;
-        return false;
-    });
-    BOOST_CHECK(utf8_header_iterator != headers.end());
-    std::cout << "utf8 header parsed, name: " << utf8_header_iterator->name << ", value: " << utf8_header_iterator->value << std::endl;
-}
+        if (header_iterator->name == utf8_header.name && header_iterator->value == utf8_header.value)
+            break;
+    }
+    std::wstring utf16_test_name_from_header = boost::locale::conv::utf_to_utf<wchar_t>(header_iterator->value);
+    BOOST_CHECK(header_iterator != headers.end());
+    BOOST_CHECK(utf16_test_name_from_header == utf16_test_name);
+    std::cout << "utf8 header parsed, name: " << header_iterator->name << ", value: " << header_iterator->value;
+}
