Added unit tests for encoded strings in URL.

glynos · glynos · commit 2eebc5577b5f · 2011-08-23T07:59:01.000+02:00
diff --git a/boost/network/uri/uri_accessors.hpp b/boost/network/uri/uri_accessors.hpp
@@ -9,6 +9,8 @@
 
 
 # include <boost/network/uri/uri.hpp>
+# include <boost/network/uri/encode.hpp>
+# include <boost/network/uri/decode.hpp>
 # include <boost/spirit/include/qi.hpp>
 
 
@@ -80,6 +82,16 @@ typename basic_uri<Tag>::string_type password(const basic_uri<Tag> &uri) {
     }
     return typename string<Tag>::type(it, boost::end(user_info_range));
 }
+
+template <
+    class Tag
+    >
+typename basic_uri<Tag>::string_type decoded_path(const basic_uri<Tag> &uri) {
+    typename basic_uri<Tag>::const_range_type path_range = uri.path_range();
+    typename basic_uri<Tag>::string_type decoded_path;
+    decode(path_range, std::back_inserter(decoded_path));
+    return decoded_path;
+}
 } // namespace uri
 } // namespace network
 } // namespace boost
diff --git a/libs/network/test/uri/url_test.cpp b/libs/network/test/uri/url_test.cpp
@@ -201,16 +201,18 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(encoded_uri_test, T, tag_types) {
     typedef uri::basic_uri<T> uri_type;
     typedef typename uri_type::string_type string_type;
 
-    const std::string url("http://www.example.com/");
+    const std::string url("http://www.example.com/Path%20With%20%28Some%29%20Encoded%20Characters%21");
     const std::string scheme("http");
     const std::string host("www.example.com");
-    const std::string path("/");
+    const std::string encoded_path("/Path%20With%20%28Some%29%20Encoded%20Characters%21");
+    const std::string decoded_path("/Path With (Some) Encoded Characters!");
 
     uri_type instance(string_type(boost::begin(url), boost::end(url)));
     BOOST_REQUIRE(uri::is_valid(instance));
     BOOST_CHECK(boost::equal(uri::scheme(instance), scheme));
     BOOST_CHECK(boost::equal(uri::host(instance), host));
-    BOOST_CHECK(boost::equal(uri::path(instance), path));
+    BOOST_CHECK(boost::equal(uri::path(instance), encoded_path));
+    BOOST_CHECK(boost::equal(uri::decoded_path(instance), decoded_path));
 }
 
 BOOST_AUTO_TEST_CASE_TEMPLATE(copy_constructor_test, T, tag_types) {
