add tests to issue 161

ky · ky · commit f77a94f97703 · 2012-12-07T16:49:56.000+04:00
diff --git a/include/network/uri/accessors.hpp b/include/network/uri/accessors.hpp
@@ -32,8 +32,8 @@ struct key_value_sequence
     {
         query =  pair >> *((boost::spirit::qi::lit(';') | '&') >> pair);
         pair  =  key >> -('=' >> value);
-        key   =  spirit::qi::char_("a-zA-Z_") >> *spirit::qi::char_("-+.~a-zA-Z_0-9/%");
-        value = *spirit::qi::char_("-+.~a-zA-Z_0-9/%");
+        key   =  boost::spirit::qi::char_("a-zA-Z_") >> *boost::spirit::qi::char_("-+.~a-zA-Z_0-9/%");
+        value = *boost::spirit::qi::char_("-+.~a-zA-Z_0-9/%");
     }
 
     boost::spirit::qi::rule<uri::const_iterator, Map()> query;
diff --git a/libs/network/test/uri/uri_test.cpp b/libs/network/test/uri/uri_test.cpp
@@ -691,3 +691,17 @@ BOOST_AUTO_TEST_CASE(uri_unordered_set_test) {
     BOOST_REQUIRE(!uri_set.empty());
     BOOST_CHECK_EQUAL((*uri_set.begin()), network::uri("http://www.example.com/"));
 }
+
+BOOST_AUTO_TEST_CASE(issue_161_test) {
+    network::uri instance("http://www.example.com/path?param1=-&param2=some+plus+encoded+text&param3=~");
+    BOOST_REQUIRE(network::valid(instance));
+
+    std::map<std::string, std::string> queries;
+    network::query_map(instance, queries);
+    BOOST_REQUIRE_EQUAL(queries.size(), std::size_t(3));
+    BOOST_CHECK_EQUAL(queries["param1"], "-");
+    BOOST_CHECK_EQUAL(queries["param2"], "some+plus+encoded+text");
+    BOOST_CHECK_EQUAL(queries["param3"], "~");
+    BOOST_CHECK_EQUAL(network::decoded(queries["param2"]), "some plus encoded text");
+}
+

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ struct key_value_sequence`
`32`	`32`	`{`
`33`	`33`	`query = pair >> *((boost::spirit::qi::lit(';') \| '&') >> pair);`
`34`	`34`	`pair = key >> -('=' >> value);`
`35`		`- key = spirit::qi::char_("a-zA-Z_") >> *spirit::qi::char_("-+.~a-zA-Z_0-9/%");`
`36`		`- value = *spirit::qi::char_("-+.~a-zA-Z_0-9/%");`
	`35`	`+ key = boost::spirit::qi::char_("a-zA-Z_") >> *boost::spirit::qi::char_("-+.~a-zA-Z_0-9/%");`
	`36`	`+ value = *boost::spirit::qi::char_("-+.~a-zA-Z_0-9/%");`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`boost::spirit::qi::rule<uri::const_iterator, Map()> query;`